diff --git a/ChangeLog b/ChangeLog index 3dbd67a..5bd1421 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,536 @@ +2014-07-27 Sergey Poznyakoff + + Version 1.28 + +2014-07-27 Nathan Stratton Treadway + + Minor change in docstrings. nor ch# + + Restructure the remfiles testsuite. + +2014-07-22 Sergey Poznyakoff + + Don't build ttyemu and run tty I/O test if grantpt is not + available. + + * configure.ac (TAR_COND_GRANTPT): Define conditional depending + on whether grantpt is available. + * gnulib.modules: Remove grantpt. It relies upon a helper binary + pt_chown which it installs and which is useless in the testsuite. + * tests/Makefile.am [TAR_COND_GRANTPT]: Build ttyemu + * tests/iotty.at: Skip test if ttyemu is not build. + * tests/ttyemu.c (noecho): Fix error message + (main): Use TIOCSCTTY if it is defined. + +2014-07-22 Benno Schulenberg + + Fix a typo and some wordings in the documentation. + + * doc/tar.texi: Fix some missing articles, and make it clearer + that "any" does not mean "anything" but "either of the two". + +2014-07-22 Nathan Stratton Treadway + + Fix the testsuite + + * tests/incr07.at: Don't assume case-sensitive filesystem. + +2014-07-11 Paul Eggert + + tar: minor fixups related to recent checkpoint.c change + + * src/checkpoint.c (getwidth, format_checkpoint_string): + Use long and strtol, not int, to avoid overflow issues. + (getwidth): Don't assume termios.h defines TIOCGWINSZ, + as it doesn't on some older hosts. + +2014-07-11 Sergey Poznyakoff + + Bugfixes + + * gnulib.modules: Add faccessat + * src/checkpoint.c: Include termios.h + +2014-06-29 Nathan Stratton Treadway + + tar: document xgetcwd test case better + + * src/misc.c (normalize_filename): Add commentary for clarity. + * tests/extrac09.at: Retitle test case and add comments for + clarity. + +2014-06-24 Sergey Poznyakoff + + Fix typos in ChangeLog + + * ChangeLog.CVS: Fix typos. + * ChangeLog.amend: New file. + * Makefile.am: Define changelog_amend_file. + +2014-04-30 Paul Eggert + + tar: do not dereference NULL pointer with '--remove-files .' + + Problem reported by Thorsten Hirsch in: + http://lists.gnu.org/archive/html/bug-tar/2014-04/msg00011.html + * src/unlink.c (flush_deferred_unlinks): + Do not attempt to find the parent of "." when "." is + at the top level. + * tests/remfiles10.at: New file. + * tests/Makefile.am (TESTSUITE_AT): + * tests/testsuite.at: Add it. + +2014-03-27 Sergey Poznyakoff + + Refuse to write archive contents to a tty. + + * NEWS: Update. + * src/buffer.c (_open_archive): Refuse to write to a tty. + * tests/iotty.at: Test output to a tty. + +2014-03-26 Vitezslav Cizek + + fix an eternal loop in handle_option + + * src/names.c (handle_option): increment loop counter + +2014-03-20 Sergey Poznyakoff + + Fail if archive comes from a terminal. + + Based on patch from Pavel Raiskup . + + * gnulib.modules: Add new modules. + * src/buffer.c (_open_archive): Refuse to read archive from a tty. + * tests/Makefile.am (TESTSUITE_AT): Add iotty.at + (check_PROGRAMS): New program ttyemu + * tests/testsuite.at: Include iotty.at + * tests/iotty.at: New file. + * tests/ttyemu.c: New file. + +2014-03-13 Paul Eggert + + tar: port to Solaris 9 + + Problem reported by Jesse C in: + http://lists.gnu.org/archive/html/bug-tar/2014-03/msg00034.html + * gnulib.modules: Add strtoimax and strtoumax, since tar invokes + these functions directly and they don't exist on Solaris 9. + +2014-02-25 Sergey Poznyakoff + + Test the --[no-]recursive options (see commit 2bd9c153_. + + * tests/recurs02.at: New test case. + * tests/Makefile.am: Add new file. + * tests/testsuite.at: Add new file. + +2014-02-22 Sergey Poznyakoff + + Support exclusion patterns from various VCS ignore lists. + + * src/Makefile.am (tar_SOURCES): Add exclist.c + * src/common.h (EXCL_DEFAULT, EXCL_RECURSIVE) + (EXCL_NON_RECURSIVE): New flags. + (excfile_add, info_attach_exclist) + (info_cleanup_exclist,info_free_exclist) + (exclude_vcs_ignores): New prototypes. + * src/create.c (dump_dir0): Call info_attach_exclist. + * src/exclist.c: New file. + * src/incremen.c (scan_directory): Call info_attach_exclist. + * src/names.c (excluded_name): Moved to exclist.c. Change + signature. + All uses updated. + * src/tar.c: New options: --exclude-ignore, + --exclude-ignore-recursive + and --exclude-vcs-ignores. + (tar_stat_destroy): Free exclist. + * src/tar.h (tar_stat_info): New member exclude_list. + + * NEWS: Document new exclusion options. + * doc/tar.texi: Likewise. + * doc/tar.1: Likewise. + +2014-02-14 Sergey Poznyakoff + + Fix in testsuite + + * acls03.at: Fix improper invocation of setfacl. + +2014-02-14 Pavel Raiskup + + testsuite: add test for buggy default ACLs + + * tests/Makefile.am: Mention acls03.at. + * tests/testsuite.at: Likewise. + * tests/acls03.at: New testcase. + +2014-02-14 Pavel Raiskup + + acls: bugfix for default ACLs extraction + + When --acls option is on (regardless of tarball contents or + tarball format), we should explicitly set OR delete default ACLs + for extracted directories. Prior to this update, we always + created arbitrary default ACLs based standard file permissions. + + * configure.ac (with_posix_acls): Check also for acl_free and + acl_delete_def_file to mark IEEE 1003.1e ACLs as supported. + * src/xattrs.c (acl_delete_def_file_at): New function. + (xattrs__acls_set): Do not treat acls_option at all; Delete + default ACLs if appropriate. + + References: + http://www.mail-archive.com/bug-tar@gnu.org/msg04355.html + Thanks: Juan J. Martínez and Mark Steinborn + +2014-02-14 Pavel Raiskup + + tar: imply --xattrs when --xattrs-{inc,exc}lude used + + Options --xattrs-include=MASK and --xattrs-exclude=MASK now turn + on the --xattrs option. + + Fix also bug in printing in xattrs.c - don't print when option is + negative. + + * src/tar.c (set_xattr_option): New static function. + (parse_opt): Call new function when --xatrrs, --xattrs-include or + --xattrs-exclude option is used. + * src/xattrs.c (xattrs_print, xattrs_print_char): Expect positive + values in options. + +2014-02-14 Sergey Poznyakoff + + THANKS: Add Anthony G. Basile. + +2014-02-14 Sergey Poznyakoff + + Use correct headers/libraries when providing xattr support + + See https://savannah.gnu.org/patch/index.php?8252. Patch provided + by Anthony G. Basile. + + * acinclude.m4 (TAR_HEADERS_ATTR_XATTR_H): Look for + first and then for . Link against libattr.so if + needed. + * lib/xattr-at.h: Include sys/xattr.h or attr/xattr.h, depending + on which one is detected. + * src/Makefile.am [TAR_LIB_ATTR] (tar_LDADD): Link against -lattr. + +2014-02-14 Sergey Poznyakoff + + Minor change + + * src/tar.c (decode_options): Silently ignore --one-top-level + if used with a non-reading command. + +2014-02-14 Sergey Poznyakoff + + New option --sort=ORDER + + This option makes tar sort the entries of directories that will be + added to an archive according to ORDER (none, name, or order). + + Based on proposition by Dick Streefland + (https://savannah.gnu.org/patch/?7892). + + * src/common.h (savedir_sort_order): New global. + * src/create.c: Pass savedir_sort_order to streamsavedir. + * src/misc.c: Likewise. + * src/tar.c: New option --sort. + + * NEWS: Update. + * doc/tar.texi: Document the --sort option. + * doc/tar.1: Likewise. + +2014-02-13 Sergey Poznyakoff + + Fix the testsuite + + * tests/opcomp01.at: Update expected error messages. + * tests/opcomp03.at: Likewise. + +2014-02-13 Sergey Poznyakoff + + Fix --one-top-level used together with --list. + + * src/extract.c: Move one_top_level stuff to tar.c + (decode_options). + * src/tar.c (option_conflict_error): New function. + (decode_options): Use option_conflict_error to complain about + conflicting options in a uniform manner. + Process one_top_level options here. + (request_stdin): Fix error message. + * tests/onetop04.at: New testcase: check --one-top-level with + --list. + * tests/Makefile.am: Add new testcase. + * tests/testsuite.at: Add new testcase. + +2014-02-13 Sergey Poznyakoff + + Fix NEWS + + * NEWS: Remove duplicate description of the --one-top-level + option. + +2014-02-12 Sergey Poznyakoff + + configure.ac: look for host-prefixed ar + + See https://savannah.gnu.org/patch/?8183 + +2014-02-10 Sergey Poznyakoff + + Bugfix + + * src/suffix.c (find_compression_suffix): Fix eventual coredump. + +2014-02-10 Sergey Poznyakoff + + Fix docs. + +2014-02-10 Sergey Poznyakoff + + Update docs. + + * NEWS: Document --one-top-level + * THANKS: Mention Connor Behan + +2014-01-30 Sergey Poznyakoff + + Update copyright years. + +2014-01-28 Sergey Poznyakoff + + Improve one-top-level functionality + + Make sure the changes become visible with + --show-transformed-names. + + * src/common.h (strip_compression_suffix): New function. + (one_top_level): Rename to one_top_level_dir. All uses changed. + * src/extract.c (extr_init): Use strip_compression_suffix. + Bail out if unable to determine top-level directory. + (maybe_prepend_name): Remove. All uses removed. + * src/tar.c (options): --one-top-level takes optional argument. + (parse_opt): Handle it. + * src/list.c (enforce_one_top_level): New function. + (transform_stat_info): Call enforce_one_top_level if required. + * src/suffix.c (compression_suffixes): List "tar" (no + compression); + terminate with NULL entry. + (find_compression_suffix): New static. + (strip_compression_suffix): New function. + + * doc/tar.1: Update. + * doc/tar.texi: Update. + + * tests/onetop01.at: New testcase. + * tests/onetop02.at: New testcase. + * tests/onetop03.at: New testcase. + * tests/Makefile.am: Add new testcases. + * tests/testsuite.at: Likewise. + +2014-01-27 Connor Behan + + Detect tarbombs while extracting + + * src/common.h (one_top_level_option): New global. + (one_top_level): New global. + * src/extract.c (extr_init): If one_top_level_option is set, + determine + the name one_top_level that might have to be prepended. + (extract_archive): If one_top_level_option is set, prepend + one_top_level + to all names that don't already start with it. + * src/tar.c (ONE_TOP_LEVEL_OPTION): New contant. + (options): New option --one-top-level. + (parse_opt): Handle this option. + (decode_options): Make it conflict with --absolute-names. + +2014-01-27 Sergey Poznyakoff + + Don't install rmt.8 if rmt is not built. + + * doc/Makefile.am [PU_RMT_COND]: Define RMT_8 + (dist_man_MANS): use RMT_8 instead of the hardcoded rmt.8 + +2014-01-27 Sergey Poznyakoff + + Provide tar(1) and rmt(8) manpages. + + * NEWS: Update. + * doc/Makefile.am: Add manpages. + * doc/tar.1: New file. + + * src/tar.c (tar_help_filter): Handle LZOP_OPTION. + +2014-01-23 Sergey Poznyakoff + + Make sure transformed file names retain trailing slash in listing. + + * src/list.c (simple_print_header): Print trailing slash + if using the transformed name. + Use had_trailing_slash instead of analyzing last byte if temp_name + +2014-01-22 Sergey Poznyakoff + + checkpoint actions: further improvements. + + * NEWS: Update. + * doc/tar.texi: Update. + * src/buffer.c (print_stats): Avoid use of additional string + buffer. + Allow for text to be NULL. + Call gettext if it is not. + (format_total_stats): Don't use gettext when calling print_stats. + * src/checkpoint.c (def_format): Change default format. + (format_checkpoint_string): Implement optional arguments for + T conversion. + (finish_checkpoint_actions): Rename to checkpoint_flush_actions, + make extern. All uses changed. + * src/common.h (checkpoint_flush_actions): New proto. + * src/tar.c (main): Set error_hook + +2014-01-22 Sergey Poznyakoff + + Improve checkpoint interface. + + * src/buffer.c (format_total_stats): The format arg is const + All uses updated. + (default_total_format): const + * src/checkpoint.c (tty, tty_cleanup): New static. + (format_checkpoint_string): New "canned" format %c + (checkpoint_finish): New function. + * src/common.h (checkpoint_finish): New proto. + * src/tar.c (main): Call checkpoint_finish.` + +2014-01-21 Sergey Poznyakoff + + Implement statistics display in checkpoint actions. + + * NEWS: Update. + * configure.ac: Version 1.27.90 + * gnulib.modules: Add fprintftime. + * doc/tar.texi: Document the "totals" action and new format + specifiers + for echo and ttyout checkpoint actions. + * src/buffer.c (compute_duration): Return computed value. + (print_stats): Don't print trailing newline. Return number of + characters output. + (format_total_stats): New function. + (print_total_stats): Rewrite via format_total_stats. + * src/checkpoint.c (checkpoint_opcode) : New opcode. + (checkpoint_compile_action): Handle cop_totals. + (expand_checkpoint_string): Remove. + (format_checkpoint_string): New function to be used instead of + expand_checkpoint_string. All callers updated. + * src/common.h (TF_READ,TF_WRITE) + (TF_DELETED): New constants. + (format_total_stats,print_total_stats): New protos. + +2014-01-10 Sergey Poznyakoff + + Remove shar archives from distribution. + + These are going to phase out in automake 2.0 + +2014-01-10 Sergey Poznyakoff + + Fix the use of --no-recursion and --recursion options. + + Each option remains in effect until cancelled by the next + ocurrence + of its counterpart, as stated in the documentation. + + * src/names.c (name_next_elt): Restore recursion_option from the + value of matching_flags. + +2014-01-09 Sergey Poznyakoff + + Minor bugfixes + + * src/compare.c (diff_dumpdir): Close descriptor if fstat failed. + (diff_multivol): Make sure the descriptor is closed and eventual + errors reported if lseek fails. + Both reported by Jiri Kukacka. + +2014-01-07 Paul Eggert + + tar: work aruond IBM XL C bug + + * src/incremen.c (show_snapshot_field_ranges) + (write_directory_file_entry): Use simpler array size expression, + one that evaluates to the same value. This works around + a compiler + bug with IBM XL C. Problem reported by Yannick Bergeron in + . + +2014-01-03 Paul Eggert + + tar: update ancient configure cruft + + * configure.ac: Use AC_PROG_CC_STDC, not just AC_PROG_CC. + Remove obsolete macros AC_ISC_POSIX, AC_HEADER_SYS_WAIT, + AC_HEADER_DIRENT, AC_HEADER_STAT, AC_HEADER_STDC, AC_TYPE_SIGNAL, + AC_TYPE_SIZE_T. + * lib/prepargs.c (IN_CTYPE_DOMAIN): Remove. All uses removed. + * src/list.c (from_header): Use isspace, not ISSPACE. + * src/system.c (pipe_handler, sys_exec_info_script): + * src/tar.c (sigstat): + Use void, not RETSIGTYPE. + +2013-11-17 Sergey Poznyakoff + + Version 1.27.1 + +2013-11-17 Sergey Poznyakoff + + Fix star compatibility (sparse headers) + + * src/sparse.c (star_get_sparse_info): Update file->dumped_size + +2013-11-17 Sergey Poznyakoff + + Fix GNU long link header. + + * src/create.c (write_gnu_long_link): Set timestamp to + 0 for backward compatibility. Bug reported by David Barri. + * THANKS: Update. + +2013-11-17 Sergey Poznyakoff + + Fix unquoting of input file names. + + * src/names.c (read_next_name): Unquote file names coming from the + -T argument. Bug reported by Nicolas Dudebout. + * THANKS: Update. + +2013-10-24 Paul Eggert + + build: fix bug where 'configure --with-posix-acls' disables ACLs + + Reported by Lars Wendler in + . + * configure.ac (with_posix_acls): Fix typo. + +2013-10-23 Paul Eggert + + Fix core dump on Solaris 10 when "." isn't readable. + + Reported by Peter Kruse in + . + This doesn't fix all the Solaris 10 test failures, just the + core dump. + * src/common.h, src/misc.c (tar_getcdpath): Now static. + * src/misc.c (normalize_filename): Report a fatal error + if cdpath is null, since we don't know the absolute name + of the working directory in that case. FIXME: there should + be no need to know absolute file names. + (chdir_arg): Simplify wd allocation. + Don't assume that xgetcwd returns non-null. + 2013-10-06 Sergey Poznyakoff Version 1.27 @@ -4727,7 +5260,7 @@ along with this program. If not, see . this has undefined behavior. Likewise for assigning arbitrary uintmax_t values to other types. (read_negative_num, read_unsigned_num, read_timespec): - New functions, to check input values a bit more carefuly. + New functions, to check input values a bit more carefully. (read_num): Use read_unsigned_num. New arg MAX_VAL; all callers changed. (read_incr_db_2): Use these new functions. @@ -4907,7 +5440,7 @@ along with this program. If not, see . * src/delete.c: Remove second argument from calls to name_scan * src/update.c: Likewise * src/incremen.c (procdir): Use is_individual_file to check for - files explicitely specified in the command line. Fixes bug + files explicitly specified in the command line. Fixes bug reported by Dat Head on 19 Jun 2006 (descending into mountpoints with --one-file-system in use) * src/misc.c (maybe_backup_file): Second argument is bool @@ -4966,7 +5499,7 @@ along with this program. If not, see . * src/delete.c (records_skipped): Remove static qualifier, the variable is used by print_total_stats in buffer.c * src/extract.c (check_time): Use volume_start_time when checking - for timestamp plausability. + for timestamp plausibility. * src/tar.c: (options, parse_opt): Allow for optional argument to the --totals option, which specifies a signal upon delivery of which the statistics must be output. @@ -5024,7 +5557,7 @@ along with this program. If not, see . * src/transform.c (set_transform_expr,_transform_name_to_obstack): Implement NUMBER flag. - (add_char_segment): Fix length assignement + (add_char_segment): Fix length assignment * doc/tar.texi: Update @@ -5081,7 +5614,7 @@ along with this program. If not, see . * doc/tar.texi: Update * configure.ac (AM_INIT_AUTOMAKE): Use tar-ustar option. Raise version requirement to 1.9 - * src/common.h (struct name): Refactured + * src/common.h (struct name): Refactored (warn_regex_usage): New variable. (dump_file): First argument is const char*. (name_init,name_add): Removed @@ -5456,13 +5989,13 @@ along with this program. If not, see . * src/common.h (struct name): New member `explicit'. Remove unused member `isdir'. * src/incremen.c (procdir): If name_scan() returns something, - check if it was explicitely given in the command line + check if it was explicitly given in the command line * src/names.c (addname,add_hierarchy_to_namelist): Initialize explicit member appropriately. * src/incremen.c (procdir): If --one-file-system is given and a directory is found to be on another device, *and* this directory - is explicitely given in the command line, then do not omit it. + is explicitly given in the command line, then do not omit it. 2005-12-11 Sergey Poznyakoff @@ -5497,7 +6030,7 @@ along with this program. If not, see . (mode_to_chars, off_to_chars, size_to_chars, time_to_chars) (uid_to_chars, uintmax_to_chars): Return bool (to_chars): Return bool - (start_header): Check return values of convertion routines. Fail + (start_header): Check return values of conversion routines. Fail if unable to store data in the header. 2005-12-07 Sergey Poznyakoff @@ -5797,13 +6330,13 @@ along with this program. If not, see . archives. * src/incremen.c (dumpdir_size, get_gnu_dumpdir): New functions. (purge_directory): Use stat_info.dumpdir instead of getting its - value explicitely. + value explicitly. * src/list.c (list_archive): Handle incremental backups in pax format. (decode_header): Initialize stat_info.dumpdir * src/sparse.c (sparse_diff_file): Bugfix: set seekable. (pax_dump_header): Store sparse map in GNU.sparse.map. If this - variable has been explicitely deleted, use GNU.sparse.offset/ + variable has been explicitly deleted, use GNU.sparse.offset/ GNU.sparse.numbytes variables. * src/tar.c (decode_options): Incremental options are allowed with --format=pax @@ -5881,7 +6414,7 @@ along with this program. If not, see . * bootstrap: Fix quoting in help output. (update_po): Use backward-compatible wget option --cache instead - of deprecated -C to accomodate for wget 1.10. + of deprecated -C to accommodate for wget 1.10. Changes proposed by Eric Blake * THANKS: Add Eric Blake @@ -6432,7 +6965,7 @@ along with this program. If not, see . * src/list.c: Likewise * tests/multiv03.at: Modified to match the new behavior - * tests/multiv04.at: New file. Test splittind directory members between + * tests/multiv04.at: New file. Test splitting directory members between the archive volumes. * tests/Makefile.am: Add multiv04.at * tests/testsuite.at: Likewise. @@ -8186,7 +8719,7 @@ along with this program. If not, see . * src/create.c: Do not zero-terminate name field if the name is exactly 100 characters long. - (write_ustar_long_name): Fixed cheking for unsplittable + (write_ustar_long_name): Fixed checking for unsplittable names. 2003-11-14 Sergey Poznyakoff @@ -8883,7 +9416,7 @@ along with this program. If not, see . interface. (child_open_for_compress): Do not increase size to BLOCKSIZE. (open_archive): Open index file name. - Strip trailing slahes from file names. + Strip trailing slashes from file names. (flush_write): Set size to 0 if not saving names. (flush_write, flush_read): Use safer_name_suffix rather than inline code. @@ -9716,7 +10249,7 @@ along with this program. If not, see . (decode_options): Dates that look like an absolute path name, or that start with '.', are presumed to be file names whose dates are taken. - Remove 'I' as an aliase for 'T'. + Remove 'I' as an alias for 'T'. Update copyright. * src/extract.c (): Do not include; system.h now does this. diff --git a/INSTALL b/INSTALL index 007e939..2099840 100644 --- a/INSTALL +++ b/INSTALL @@ -12,8 +12,8 @@ without warranty of any kind. Basic Installation ================== - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following + Briefly, the shell command `./configure && make && make install' +should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for instructions specific to this package. Some packages provide this `INSTALL' file but do not implement all of the features documented diff --git a/Makefile.am b/Makefile.am index 0fea308..96505c0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Main Makefile for GNU tar. -# Copyright 1994-1997, 1999-2001, 2003, 2007, 2009, 2013 Free Software -# Foundation, Inc. +# Copyright 1994-1997, 1999-2001, 2003, 2007, 2009, 2013-2014 Free +# Software Foundation, Inc. # This file is part of GNU tar. @@ -36,3 +36,4 @@ include Make.rules gen_start_date = 2009-03-06 prev_change_log = ChangeLog.CVS changelog_dir = . +changelog_amend_file=ChangeLog.amend diff --git a/Makefile.in b/Makefile.in index 907819f..f9f1d1d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.6 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,8 +16,8 @@ # Main Makefile for GNU tar. -# Copyright 1994-1997, 1999-2001, 2003, 2007, 2009, 2013 Free Software -# Foundation, Inc. +# Copyright 1994-1997, 1999-2001, 2003, 2007, 2009, 2013-2014 Free +# Software Foundation, Inc. # This file is part of GNU tar. @@ -79,23 +79,51 @@ # gen_start_date [optional] Start ChangeLog from this date. # changelog_dir [mandatory] Directory where to create ChangeLog VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -113,26 +141,26 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Make.rules \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/config.h.in $(top_srcdir)/build-aux/compile \ +DIST_COMMON = $(srcdir)/Make.rules INSTALL NEWS README AUTHORS \ + ChangeLog THANKS $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in ABOUT-NLS COPYING 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 $(top_srcdir)/configure \ - ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS THANKS TODO \ - build-aux/compile build-aux/config.guess \ - build-aux/config.rpath build-aux/config.sub build-aux/depcomp \ - build-aux/install-sh build-aux/mdate-sh build-aux/missing \ - build-aux/texinfo.tex build-aux/ylwrap + $(top_srcdir)/build-aux/missing subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ - $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/alloca.m4 \ - $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/backupfile.m4 \ - $(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/btowc.m4 \ - $(top_srcdir)/m4/canonicalize.m4 \ + $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/acl.m4 \ + $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argp.m4 \ + $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \ + $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/chown.m4 \ $(top_srcdir)/m4/clock_time.m4 \ $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ @@ -144,9 +172,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup.m4 \ $(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/eealloc.m4 \ $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/errno_h.m4 \ - $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exponentd.m4 \ - $(top_srcdir)/m4/extensions.m4 \ - $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fchdir.m4 \ + $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/euidaccess.m4 \ + $(top_srcdir)/m4/exponentd.m4 $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/extern-inline.m4 \ + $(top_srcdir)/m4/faccessat.m4 $(top_srcdir)/m4/fchdir.m4 \ $(top_srcdir)/m4/fchmodat.m4 $(top_srcdir)/m4/fchownat.m4 \ $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl.m4 \ $(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fdopendir.m4 \ @@ -158,19 +187,21 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/m4/getcwd-path-max.m4 $(top_srcdir)/m4/getcwd.m4 \ $(top_srcdir)/m4/getdelim.m4 $(top_srcdir)/m4/getdtablesize.m4 \ - $(top_srcdir)/m4/getline.m4 $(top_srcdir)/m4/getopt.m4 \ - $(top_srcdir)/m4/getpagesize.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gettime.m4 $(top_srcdir)/m4/gettimeofday.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/human.m4 \ + $(top_srcdir)/m4/getgroups.m4 $(top_srcdir)/m4/getline.m4 \ + $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/getpagesize.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettime.m4 \ + $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ + $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 \ + $(top_srcdir)/m4/group-member.m4 $(top_srcdir)/m4/human.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/include_next.m4 \ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \ $(top_srcdir)/m4/inttostr.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ - $(top_srcdir)/m4/iswblank.m4 $(top_srcdir)/m4/langinfo_h.m4 \ - $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lchown.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/isatty.m4 $(top_srcdir)/m4/iswblank.m4 \ + $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ + $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ $(top_srcdir)/m4/link-follow.m4 $(top_srcdir)/m4/link.m4 \ $(top_srcdir)/m4/linkat.m4 $(top_srcdir)/m4/localcharset.m4 \ @@ -196,19 +227,21 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/paxutils.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf.m4 \ - $(top_srcdir)/m4/priv-set.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ - $(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \ - $(top_srcdir)/m4/read.m4 $(top_srcdir)/m4/readdir.m4 \ - $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/readlinkat.m4 \ - $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.m4 \ - $(top_srcdir)/m4/rename.m4 $(top_srcdir)/m4/renameat.m4 \ - $(top_srcdir)/m4/rewinddir.m4 $(top_srcdir)/m4/rmdir.m4 \ - $(top_srcdir)/m4/rmt.m4 $(top_srcdir)/m4/rpmatch.m4 \ - $(top_srcdir)/m4/rtapelib.m4 $(top_srcdir)/m4/safe-read.m4 \ - $(top_srcdir)/m4/safe-write.m4 $(top_srcdir)/m4/save-cwd.m4 \ - $(top_srcdir)/m4/savedir.m4 $(top_srcdir)/m4/secure_getenv.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix_openpt.m4 \ + $(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/priv-set.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/ptsname.m4 \ + $(top_srcdir)/m4/ptsname_r.m4 $(top_srcdir)/m4/quote.m4 \ + $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/raise.m4 \ + $(top_srcdir)/m4/rawmemchr.m4 $(top_srcdir)/m4/read.m4 \ + $(top_srcdir)/m4/readdir.m4 $(top_srcdir)/m4/readlink.m4 \ + $(top_srcdir)/m4/readlinkat.m4 $(top_srcdir)/m4/realloc.m4 \ + $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rename.m4 \ + $(top_srcdir)/m4/renameat.m4 $(top_srcdir)/m4/rewinddir.m4 \ + $(top_srcdir)/m4/rmdir.m4 $(top_srcdir)/m4/rmt.m4 \ + $(top_srcdir)/m4/rpmatch.m4 $(top_srcdir)/m4/rtapelib.m4 \ + $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/safe-write.m4 \ + $(top_srcdir)/m4/save-cwd.m4 $(top_srcdir)/m4/savedir.m4 \ + $(top_srcdir)/m4/secure_getenv.m4 \ $(top_srcdir)/m4/selinux-context-h.m4 \ $(top_srcdir)/m4/selinux-selinux-h.m4 \ $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/signal_h.m4 \ @@ -221,20 +254,23 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \ $(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \ - $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strings_h.m4 $(top_srcdir)/m4/strndup.m4 \ - $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strtol.m4 \ - $(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \ - $(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/symlink.m4 \ - $(top_srcdir)/m4/symlinkat.m4 $(top_srcdir)/m4/sys_socket_h.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strftime.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \ + $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ + $(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \ + $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \ + $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \ + $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/symlinkat.m4 \ + $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sysexits.m4 \ $(top_srcdir)/m4/system.m4 $(top_srcdir)/m4/tempname.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ - $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \ - $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkat.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \ + $(top_srcdir)/m4/ttyname_r.m4 $(top_srcdir)/m4/unistd-safer.m4 \ + $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ + $(top_srcdir)/m4/unlinkat.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/unlockpt.m4 \ $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utimens.m4 \ $(top_srcdir)/m4/utimensat.m4 $(top_srcdir)/m4/utimes.m4 \ $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ @@ -270,13 +306,14 @@ am__v_at_0 = @ am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -284,9 +321,30 @@ am__can_run_installinfo = \ esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags CSCOPE = cscope @@ -326,10 +384,9 @@ am__relativize = \ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).tar.xz \ - $(distdir).shar.gz +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 $(distdir).tar.xz GZIP_ENV = --best -DIST_TARGETS = dist-xz dist-shar dist-bzip2 dist-gzip +DIST_TARGETS = dist-xz dist-bzip2 dist-gzip distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -901,6 +958,7 @@ LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@ LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ LIB_ACL = @LIB_ACL@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_EACCESS = @LIB_EACCESS@ LIB_SELINUX = @LIB_SELINUX@ LIB_SETSOCKOPT = @LIB_SETSOCKOPT@ LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ @@ -1016,11 +1074,13 @@ REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ +REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ +REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ @@ -1029,6 +1089,7 @@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ REPLACE_LOCALECONV = @REPLACE_LOCALECONV@ +REPLACE_LOCALTIME = @REPLACE_LOCALTIME@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ REPLACE_LSTAT = @REPLACE_LSTAT@ @@ -1095,6 +1156,7 @@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOD = @REPLACE_STRTOD@ REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ +REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ @@ -1122,6 +1184,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ RSH = @RSH@ +SED = @SED@ SELINUX_CONTEXT_H = @SELINUX_CONTEXT_H@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -1159,6 +1222,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -1203,6 +1267,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1217,6 +1282,7 @@ SUBDIRS = doc gnu lib rmt src scripts po tests gen_start_date = 2009-03-06 prev_change_log = ChangeLog.CVS changelog_dir = . +changelog_amend_file = ChangeLog.amend all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -1258,8 +1324,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -1278,14 +1344,13 @@ distclean-hdr: # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -1306,31 +1371,13 @@ $(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -1346,12 +1393,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1363,15 +1405,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1380,18 +1418,16 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" - cscope: cscope.files test ! -s cscope.files \ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) - clean-cscope: -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive -cscope.files: clean-cscope cscopelist-recursive cscopelist - -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -1496,9 +1532,16 @@ dist-xz: distdir $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) + dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -1700,26 +1743,23 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - cscopelist-recursive ctags-recursive install-am install-strip \ - tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-cscope \ - clean-generic cscope cscopelist cscopelist-recursive ctags \ - ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-hook \ - dist-lzip dist-shar dist-tarZ dist-xz dist-zip distcheck \ - distclean distclean-generic distclean-hdr distclean-local \ - distclean-tags distcleancheck distdir distuninstallcheck dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am +.MAKE: $(am__recursive_targets) all install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + cscope cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \ + dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \ + dist-zip distcheck distclean distclean-generic distclean-hdr \ + distclean-local distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ + tags-am uninstall uninstall-am dist-hook: diff --git a/NEWS b/NEWS index ffeb4b8..32bc881 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,86 @@ -GNU tar NEWS - User visible changes. 2013-10-05 +GNU tar NEWS - User visible changes. 2014-07-27 Please send GNU tar bug reports to + +version 1.28, 2014-07-28 + +* New checkpoint action: totals + +The --checkpoint-action=totals option instructs tar to output the +total number of bytes transferred at each checkpoint. + +* Extended checkpoint format specification. + +New conversion specifiers are implemented. Some of them take +optional arguments, supplied in curly braces between the percent +sign and the specifier letter. + + %d - Number of seconds since tar started. + %{r,w,d}T - I/O totals; optional arguments supply prefixes + to be used before number of bytes read, written and + deleted, correspondingly. + %{FMT}t - Current local time using FMT as strftime(3) format. + If {FMT} is omitted, use %c. + %{N}* - Pad output with spaces to the Nth column, or to the + current screen width, if {N} is not given. + %c - A shortcut for "%{%Y-%m-%d %H:%M:%S}t: %ds, %{read,wrote}T%*\r" + +* New option --one-top-level + +The option --one-top-level tells tar to extract all files into a +subdirectory named by the base name of the archive (minus standard +compression suffixes recognizable by --auto-compress). When used with +an argument, as in --one-top-level=DIR, the files are extracted into the +supplied DIRectory. This ensures that no archive members are +extracted outside of the specified directory, even if the archive is +crafted so as to put them elsewhere. + +* New option --sort + +The --sort=ORDER option instructs tar to sort directory entries +according to ORDER. It takes effect when creating archives. +Available ORDERs are: none (the default), name and inode. The +latter may be absent, if the underlying system does not provide +the necessary information. + +Using --sort=name ensures the member ordering in the created archive +is uniform and reproducible. Using --sort=inode reduces the number +of disk seeks made when creating the archive and thus can considerably +speed up archivation. + +* New exclusion options + + --exclude-ignore=FILE Before dumping a directory check if it + contains FILE, and if so read exclude + patterns for this directory from FILE. + --exclude-ignore-recursive=FILE + Same as above, but the exclusion patterns + read from FILE remain in effect for any + subdirectory, recursively. + --exclude-vcs-ignores Read exclude tags from VCS ignore files, + where such files exist. Supported VCS's + are: CVS, Git, Bazaar, Mercurial. + + +* Tar refuses to read input from and write output to a tty device. + +* Manpages + +This release includes official tar(1) and rmt(8) manpages. +Distribution maintainers are kindly asked to use these instead of the +home-made pages they have been providing so far. + + +version 1.27.1 - Sergey Poznyakoff, 2013-11-17 + +* Bug fixes + +* Fix unquoting of file names obtained via the -T option. + +* Fix GNU long link header timestamp (backward compatibility). + +* Fix extracting sparse members from star archives. + version 1.27 - Sergey Poznyakoff, 2013-10-05 @@ -1425,7 +1505,7 @@ Versions 1.07 back to 1.00 by Jay Fenlason. -Copyright 1994-2001, 2003-2010, 2013 Free Software Foundation, Inc. +Copyright 1994-2001, 2003-2010, 2013-2014 Free Software Foundation, Inc. This file is part of GNU tar. diff --git a/README b/README index 9c60103..b3895b0 100644 --- a/README +++ b/README @@ -222,7 +222,7 @@ and share your findings by writing to . * Copying -Copyright 1990-1992, 1994, 1997-2001, 2003-2004, 2007, 2012-2013 Free +Copyright 1990-1992, 1994, 1997-2001, 2003-2004, 2007, 2012-2014 Free Software Foundation, Inc. This file is part of GNU tar. diff --git a/THANKS b/THANKS index 79aa0ce..b4c5427 100644 --- a/THANKS +++ b/THANKS @@ -36,6 +36,7 @@ Andrew Torda torda@igc.chem.ethz.ch Andrey A. Chernov ache@astral.msk.su Andy Gay andy@rdl.co.uk Antonio Jose Coutinho ajc@di.uminho.pt +Anthony G. Basile blueness@gentoo.org Ariel Faigon ariel@engr.sgi.com Arne Wichmann aw@math.uni-sb.de Arnold Robbins arnold@gnu.org @@ -101,6 +102,7 @@ Claude Scarpelli claude@genethon.fr Claus Heine Claus_Heine@ac2.maus.de Cliff Krumvieda cliff@cs.cornell.edu Clinton Carr clint@netcom.com +Connor Behan connor.behan@gmail.com Conrad Hughes chughes@maths.tcd.ie Constantin Belous const@cris.net Coranth Gryphon gryphon@bur.visidyne.com @@ -119,6 +121,7 @@ Danny R. Johnston danny@cs.weber.edu Dave Barr barr@math.psu.edu Dave Gentzel gentzel@nova.enet.dec.com Dave Gregorich dtg@ipac.caltech.edu +David Barri japgolly@gmail.com David Brown davidb@davidb.org David J. MacKenzie djm@uunet.uu.net David Johnson David.W.Johnson@colorado.edu @@ -368,6 +371,7 @@ Neil Faulks neil@dcs.kcl.ac.uk Neil Jerram nj104@cus.cam.ac.uk Nelson H.F. Beebe beebe@math.utah.edu Nick Barron nikb@cix.compulink.co.uk +Nicolas Dudebout nicolas.dudebout@gmail.com Noah Friedman friedman@gnu.org Noel Cragg noel@red-bean.com Norbert Kiesel norbert@rwthi3.informatik.rwth-aachen.de diff --git a/TODO b/TODO index c8ed3c9..c56d335 100644 --- a/TODO +++ b/TODO @@ -45,7 +45,7 @@ Suggestions for improving GNU tar. * Copyright notice -Copyright 2003, 2004, 2007, 2013 Free Software Foundation, Inc. +Copyright 2003-2004, 2007, 2013-2014 Free Software Foundation, Inc. This file is part of GNU tar. diff --git a/acinclude.m4 b/acinclude.m4 index d48c881..3b28b3b 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1,6 +1,6 @@ dnl Special Autoconf macros for GNU tar -*- autoconf -*- -dnl Copyright 2009, 2013 Free Software Foundation, Inc. +dnl Copyright 2009, 2013-2014 Free Software Foundation, Inc. dnl dnl This file is part of GNU tar. dnl @@ -37,18 +37,40 @@ AC_DEFUN([TAR_HEADERS_ATTR_XATTR_H], [], [with_xattrs=maybe] ) - AC_CHECK_HEADERS([attr/xattr.h]) - AM_CONDITIONAL([TAR_COND_XATTR_H],[test "$ac_cv_header_attr_xattr_h" = yes]) - if test "$ac_cv_header_attr_xattr_h" = yes; then + # First check for + AC_CHECK_HEADERS([sys/xattr.h]) + AM_CONDITIONAL([TAR_COND_XATTR_H],[test "$ac_cv_header_sys_xattr_h" = yes]) + AM_CONDITIONAL([TAR_LIB_ATTR],[false]) + if test "$ac_cv_header_sys_xattr_h" = yes; then AC_CHECK_FUNCS(getxattr fgetxattr lgetxattr \ setxattr fsetxattr lsetxattr \ listxattr flistxattr llistxattr, # only when functions are present - AC_DEFINE([HAVE_ATTR_XATTR_H], [1], - [define to 1 if we have header]) + AC_DEFINE([HAVE_SYS_XATTR_H], [1], + [define to 1 if we have header]) if test "$with_xattrs" != no; then AC_DEFINE([HAVE_XATTRS],,[Define when we have working linux xattrs.]) fi ) fi + + # If is not found, then check for + if test "$ac_cv_header_sys_xattr_h" != yes; then + AC_CHECK_HEADERS([attr/xattr.h]) + AM_CONDITIONAL([TAR_COND_XATTR_H],[test "$ac_cv_header_attr_xattr_h" = yes]) + AC_CHECK_LIB([attr],[fgetxattr]) + AM_CONDITIONAL([TAR_LIB_ATTR],[test "$ac_cv_lib_attr_fgetxattr" = yes]) + if test "$ac_cv_header_attr_xattr_h" = yes; then + AC_CHECK_FUNCS(getxattr fgetxattr lgetxattr \ + setxattr fsetxattr lsetxattr \ + listxattr flistxattr llistxattr, + # only when functions are present + AC_DEFINE([HAVE_ATTR_XATTR_H], [1], + [define to 1 if we have header]) + if test "$with_xattrs" != no; then + AC_DEFINE([HAVE_XATTRS],,[Define when we have working linux xattrs.]) + fi + ) + fi + fi ]) diff --git a/aclocal.m4 b/aclocal.m4 index 30203bd..0e09589 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.12.6 -*- Autoconf -*- +# generated automatically by aclocal 1.14 -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11,6 +11,7 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, @@ -19,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-2012 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -31,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.12' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.12.6], [], +m4_if([$1], [1.14], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,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.12.6])dnl +[AM_AUTOMAKE_VERSION([1.14])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -110,7 +111,7 @@ am_aux_dir=`cd $ac_aux_dir && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2012 Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -141,7 +142,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -332,7 +333,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -343,7 +344,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -372,7 +373,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the @@ -408,7 +409,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -417,6 +418,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -429,7 +436,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -459,8 +466,7 @@ AC_SUBST([CYGPATH_W]) dnl Distinguish between old-style and new-style calls. m4_ifval([$2], [AC_DIAGNOSE([obsolete], -[$0: two- and three-arguments forms are deprecated. For more info, see: -http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation]) + [$0: two- and three-arguments forms are deprecated.]) m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], @@ -514,22 +520,60 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC], [_AM_DEPENDENCIES([OBJC])], [m4_define([AC_PROG_OBJC], m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl -dnl Support for Objective C++ was only introduced in Autoconf 2.65, -dnl but we still cater to Autoconf 2.62. -m4_ifdef([AC_PROG_OBJCXX], -[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], [_AM_DEPENDENCIES([OBJCXX])], [m4_define([AC_PROG_OBJCXX], - m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the -dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -537,7 +581,6 @@ dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -559,7 +602,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-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -580,7 +623,7 @@ if test x"${install_sh}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2012 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -601,7 +644,7 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -649,41 +692,9 @@ AC_MSG_RESULT([$_am_result]) rm -f confinc confmf ]) -# Copyright (C) 1999-2012 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2012 Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -698,8 +709,8 @@ AC_SUBST($1)]) # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -712,8 +723,8 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= AC_MSG_WARN(['missing' script is too old or missing]) @@ -722,7 +733,7 @@ fi # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -751,7 +762,54 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -770,7 +828,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -851,7 +909,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2012 Free Software Foundation, Inc. +# Copyright (C) 2009-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -911,7 +969,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2012 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -939,7 +997,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2012 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -958,7 +1016,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2012 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -977,81 +1035,120 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of '-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR m4_include([m4/00gnulib.m4]) +m4_include([m4/absolute-header.m4]) m4_include([m4/acl.m4]) m4_include([m4/alloca.m4]) m4_include([m4/argp.m4]) @@ -1080,9 +1177,11 @@ m4_include([m4/eealloc.m4]) m4_include([m4/environ.m4]) m4_include([m4/errno_h.m4]) m4_include([m4/error.m4]) +m4_include([m4/euidaccess.m4]) m4_include([m4/exponentd.m4]) m4_include([m4/extensions.m4]) m4_include([m4/extern-inline.m4]) +m4_include([m4/faccessat.m4]) m4_include([m4/fchdir.m4]) m4_include([m4/fchmodat.m4]) m4_include([m4/fchownat.m4]) @@ -1105,6 +1204,7 @@ m4_include([m4/getcwd-path-max.m4]) m4_include([m4/getcwd.m4]) m4_include([m4/getdelim.m4]) m4_include([m4/getdtablesize.m4]) +m4_include([m4/getgroups.m4]) m4_include([m4/getline.m4]) m4_include([m4/getopt.m4]) m4_include([m4/getpagesize.m4]) @@ -1114,6 +1214,7 @@ m4_include([m4/gettimeofday.m4]) m4_include([m4/glibc21.m4]) m4_include([m4/gnulib-common.m4]) m4_include([m4/gnulib-comp.m4]) +m4_include([m4/group-member.m4]) m4_include([m4/human.m4]) m4_include([m4/iconv.m4]) m4_include([m4/include_next.m4]) @@ -1123,6 +1224,7 @@ m4_include([m4/inttostr.m4]) m4_include([m4/inttypes-pri.m4]) m4_include([m4/inttypes.m4]) m4_include([m4/inttypes_h.m4]) +m4_include([m4/isatty.m4]) m4_include([m4/iswblank.m4]) m4_include([m4/langinfo_h.m4]) m4_include([m4/largefile.m4]) @@ -1180,9 +1282,12 @@ m4_include([m4/parse-datetime.m4]) m4_include([m4/pathmax.m4]) m4_include([m4/paxutils.m4]) m4_include([m4/po.m4]) +m4_include([m4/posix_openpt.m4]) m4_include([m4/printf.m4]) m4_include([m4/priv-set.m4]) m4_include([m4/progtest.m4]) +m4_include([m4/ptsname.m4]) +m4_include([m4/ptsname_r.m4]) m4_include([m4/quote.m4]) m4_include([m4/quotearg.m4]) m4_include([m4/raise.m4]) @@ -1228,11 +1333,14 @@ m4_include([m4/strcase.m4]) m4_include([m4/strchrnul.m4]) m4_include([m4/strdup.m4]) m4_include([m4/strerror.m4]) +m4_include([m4/strftime.m4]) m4_include([m4/string_h.m4]) m4_include([m4/strings_h.m4]) m4_include([m4/strndup.m4]) m4_include([m4/strnlen.m4]) +m4_include([m4/strtoimax.m4]) m4_include([m4/strtol.m4]) +m4_include([m4/strtoll.m4]) m4_include([m4/strtoul.m4]) m4_include([m4/strtoull.m4]) m4_include([m4/strtoumax.m4]) @@ -1249,12 +1357,14 @@ m4_include([m4/time_h.m4]) m4_include([m4/time_r.m4]) m4_include([m4/timespec.m4]) m4_include([m4/tm_gmtoff.m4]) +m4_include([m4/ttyname_r.m4]) m4_include([m4/unistd-safer.m4]) m4_include([m4/unistd_h.m4]) m4_include([m4/unlink.m4]) m4_include([m4/unlinkat.m4]) m4_include([m4/unlinkdir.m4]) m4_include([m4/unlocked-io.m4]) +m4_include([m4/unlockpt.m4]) m4_include([m4/utimbuf.m4]) m4_include([m4/utimens.m4]) m4_include([m4/utimensat.m4]) diff --git a/build-aux/compile b/build-aux/compile index 718dc6d..531136b 100755 --- a/build-aux/compile +++ b/build-aux/compile @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2012 Free Software Foundation, Inc. +# Copyright (C) 1999-2013 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 b79252d..1f5c50c 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2013-06-10' +timestamp='2014-03-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -149,7 +149,7 @@ Linux|GNU|GNU/*) LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` ;; esac @@ -826,7 +826,7 @@ EOF *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -969,10 +969,10 @@ EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} exit ;; - or32:Linux:*:*) + or32:Linux:*:* | or1k*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) @@ -1260,16 +1260,26 @@ EOF if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; @@ -1361,154 +1371,6 @@ EOF exit ;; esac -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - cat >&2 <, 1996 # diff --git a/build-aux/config.sub b/build-aux/config.sub index 8b612ab..5d7d62f 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2013-04-24' +timestamp='2014-03-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -68,7 +68,7 @@ Report bugs and patches to ." version="\ GNU config.sub ($timestamp) -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -257,7 +257,7 @@ case $basic_machine in | avr | avr32 \ | be32 | be64 \ | bfin \ - | c4x | clipper \ + | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | epiphany \ | fido | fr30 | frv \ @@ -265,6 +265,7 @@ case $basic_machine in | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ @@ -295,8 +296,7 @@ case $basic_machine in | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or1k | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -324,7 +324,7 @@ case $basic_machine in c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -372,7 +372,7 @@ case $basic_machine in | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ @@ -381,6 +381,7 @@ case $basic_machine in | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ @@ -413,6 +414,7 @@ case $basic_machine in | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -794,7 +796,7 @@ case $basic_machine in os=-mingw64 ;; mingw32) - basic_machine=i386-pc + basic_machine=i686-pc os=-mingw32 ;; mingw32ce) @@ -830,7 +832,7 @@ case $basic_machine in basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; msys) - basic_machine=i386-pc + basic_machine=i686-pc os=-msys ;; mvs) @@ -1546,6 +1548,9 @@ case $basic_machine in c4x-* | tic4x-*) os=-coff ;; + c8051-*) + os=-elf + ;; hexagon-*) os=-elf ;; @@ -1589,9 +1594,6 @@ case $basic_machine in mips*-*) os=-elf ;; - or1k-*) - os=-elf - ;; or32-*) os=-coff ;; diff --git a/build-aux/git-log-fix b/build-aux/git-log-fix new file mode 100644 index 0000000..1049375 --- /dev/null +++ b/build-aux/git-log-fix @@ -0,0 +1,9 @@ +# This file is expected to be used via gitlog-to-changelog's --amend=FILE +# option. It specifies what changes to make to each given SHA1's commit +# log and metadata, using Perl-eval'able expressions. + +# Here is an example, with leading "#" to comment it out: +# +#3a169f4c5d9159283548178668d2fae6fced3030 +## fix title: +#s/all tile types/all file types/ diff --git a/build-aux/gitlog-to-changelog b/build-aux/gitlog-to-changelog index e02d34c..78afff4 100755 --- a/build-aux/gitlog-to-changelog +++ b/build-aux/gitlog-to-changelog @@ -9,7 +9,7 @@ my $VERSION = '2012-07-29 06:11'; # UTC # If you change this file with Emacs, please let the write hook # do its job. Otherwise, update this string manually. -# Copyright (C) 2008-2013 Free Software Foundation, Inc. +# Copyright (C) 2008-2014 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/build-aux/install-sh b/build-aux/install-sh index 377bb86..0436737 100755 --- a/build-aux/install-sh +++ b/build-aux/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2013-10-30.23; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ mvprog=${MVPROG-mv} rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -137,40 +122,39 @@ while test $# -ne 0; do -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; -T) no_target_directory=true;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac @@ -223,16 +207,16 @@ if test -z "$dir_arg"; then *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -270,40 +254,14 @@ do # if double slashes aren't ignored. if test -d "$dst"; then if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi @@ -314,74 +272,74 @@ do if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -391,53 +349,51 @@ do # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue - - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + test X"$d" = X && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -472,15 +428,12 @@ do # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -493,24 +446,24 @@ do # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 diff --git a/build-aux/missing b/build-aux/missing index 9a55648..cdea514 100755 --- a/build-aux/missing +++ b/build-aux/missing @@ -1,10 +1,10 @@ #! /bin/sh -# Common stub for a few missing GNU programs while installing. +# Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-01-06.18; # UTC +scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996-2012 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard , 1996. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -29,61 +29,33 @@ if test $# -eq 0; then exit 1 fi -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, 'missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi +case $1 in -msg="missing on your system" + --is-lightweight) + # Used by our autoconf macros to check whether the available missing + # script is modern enough. + exit 0 + ;; -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; + --run) + # Back-compat with the calling convention used by older automake. + shift + ;; -h|--h|--he|--hel|--help) echo "\ $0 [OPTION]... PROGRAM [ARGUMENT]... -Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due +to PROGRAM being missing or too old. Options: -h, --help display this help and exit -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails Supported PROGRAM values: - aclocal touch file 'aclocal.m4' - autoconf touch file 'configure' - autoheader touch file 'config.h.in' - autom4te touch the output file, or create a stub one - automake touch all 'Makefile.in' files - bison create 'y.tab.[ch]', if possible, from existing .[ch] - flex create 'lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create 'lex.yy.c', if possible, from existing .c - makeinfo touch the output file - yacc create 'y.tab.[ch]', if possible, from existing .[ch] + aclocal autoconf autoheader autom4te automake makeinfo + bison yacc flex lex help2man Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and 'g' are ignored when checking the name. @@ -98,228 +70,141 @@ Send bug reports to ." ;; -*) - echo 1>&2 "$0: Unknown '$1' option" + echo 1>&2 "$0: unknown '$1' option" echo 1>&2 "Try '$0 --help' for more information" exit 1 ;; esac -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running '$TOOL --version' or '$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'acinclude.m4' or '${configure_ac}'. You might want - to install the Automake and Perl packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified '${configure_ac}'. You might want to install the - Autoconf and GNU m4 packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'acconfig.h' or '${configure_ac}'. You might want - to install the Autoconf and GNU m4 packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. - You might want to install the Automake and Perl packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: '$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get '$1' as part of Autoconf from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: '$1' $msg. You should only need it if - you modified a '.y' file. You may need the Bison package - in order for those modifications to take effect. You can get - Bison from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a '.l' file. You may need the Flex package - in order for those modifications to take effect. You can get - Flex from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - Help2man package in order for those modifications to take - effect. You can get Help2man from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: '$1' is $msg. You should only need it if - you modified a '.texi' or '.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy 'make' (AIX, - DU, IRIX). You might want to install the Texinfo package or - the GNU make package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; +# Run the given program, remember its exit status. +"$@"; st=$? + +# If it succeeded, we are done. +test $st -eq 0 && exit 0 + +# Also exit now if we it failed (or wasn't found), and '--version' was +# passed; such an option is passed most likely to detect whether the +# program is present and works. +case $2 in --version|--help) exit $st;; esac + +# Exit code 63 means version mismatch. This often happens when the user +# tries to use an ancient version of a tool on a file that requires a +# minimum version. +if test $st -eq 63; then + msg="probably too old" +elif test $st -eq 127; then + # Program was missing. + msg="missing on your system" +else + # Program was found and executed, but failed. Give up. + exit $st +fi - *) - echo 1>&2 "\ -WARNING: '$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the 'README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing '$1' program." - exit 1 +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software + +program_details () +{ + case $1 in + aclocal|automake) + echo "The '$1' program is part of the GNU Automake package:" + echo "<$gnu_software_URL/automake>" + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/autoconf>" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + autoconf|autom4te|autoheader) + echo "The '$1' program is part of the GNU Autoconf package:" + echo "<$gnu_software_URL/autoconf/>" + echo "It also requires GNU m4 and Perl in order to run:" + echo "<$gnu_software_URL/m4/>" + echo "<$perl_URL>" + ;; + esac +} + +give_advice () +{ + # Normalize program name to check for. + normalized_program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + + printf '%s\n' "'$1' is $msg." + + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" + case $normalized_program in + autoconf*) + echo "You should only need it if you modified 'configure.ac'," + echo "or m4 files included by it." + program_details 'autoconf' + ;; + autoheader*) + echo "You should only need it if you modified 'acconfig.h' or" + echo "$configure_deps." + program_details 'autoheader' + ;; + automake*) + echo "You should only need it if you modified 'Makefile.am' or" + echo "$configure_deps." + program_details 'automake' + ;; + aclocal*) + echo "You should only need it if you modified 'acinclude.m4' or" + echo "$configure_deps." + program_details 'aclocal' + ;; + autom4te*) + echo "You might have modified some maintainer files that require" + echo "the 'automa4te' program to be rebuilt." + program_details 'autom4te' + ;; + bison*|yacc*) + echo "You should only need it if you modified a '.y' file." + echo "You may want to install the GNU Bison package:" + echo "<$gnu_software_URL/bison/>" + ;; + lex*|flex*) + echo "You should only need it if you modified a '.l' file." + echo "You may want to install the Fast Lexical Analyzer package:" + echo "<$flex_URL>" + ;; + help2man*) + echo "You should only need it if you modified a dependency" \ + "of a man page." + echo "You may want to install the GNU Help2man package:" + echo "<$gnu_software_URL/help2man/>" ;; -esac - -exit 0 + makeinfo*) + echo "You should only need it if you modified a '.texi' file, or" + echo "any other file indirectly affecting the aspect of the manual." + echo "You might want to install the Texinfo package:" + echo "<$gnu_software_URL/texinfo/>" + echo "The spurious makeinfo call might also be the consequence of" + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" + echo "want to install GNU make:" + echo "<$gnu_software_URL/make/>" + ;; + *) + echo "You might have modified some files without having the proper" + echo "tools for further handling them. Check the 'README' file, it" + echo "often tells you about the needed prerequisites for installing" + echo "this package. You may also peek at any GNU archive site, in" + echo "case some other package contains this missing '$1' program." + ;; + esac +} + +give_advice "$1" | sed -e '1s/^/WARNING: /' \ + -e '2,$s/^/ /' >&2 + +# Propagate the correct exit status (expected to be 127 for a program +# not found, 63 for a program that failed due to version mismatch). +exit $st # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) diff --git a/build-aux/snippet/arg-nonnull.h b/build-aux/snippet/arg-nonnull.h index 8007f07..8111780 100644 --- a/build-aux/snippet/arg-nonnull.h +++ b/build-aux/snippet/arg-nonnull.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A C macro for declaring that specific arguments must not be NULL. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/build-aux/snippet/c++defs.h b/build-aux/snippet/c++defs.h index 7b0e540..047a78a 100644 --- a/build-aux/snippet/c++defs.h +++ b/build-aux/snippet/c++defs.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* C++ compatible function declaration macros. - Copyright (C) 2010-2013 Free Software Foundation, Inc. + Copyright (C) 2010-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/build-aux/snippet/unused-parameter.h b/build-aux/snippet/unused-parameter.h index f30ef47..d2d0e74 100644 --- a/build-aux/snippet/unused-parameter.h +++ b/build-aux/snippet/unused-parameter.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A C macro for declaring that specific function parameters are not used. - Copyright (C) 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2008-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/build-aux/snippet/warn-on-use.h b/build-aux/snippet/warn-on-use.h index e760dbc..feb1063 100644 --- a/build-aux/snippet/warn-on-use.h +++ b/build-aux/snippet/warn-on-use.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A C macro for emitting warnings if a function is used. - Copyright (C) 2010-2013 Free Software Foundation, Inc. + Copyright (C) 2010-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/build-aux/texinfo.tex b/build-aux/texinfo.tex index 3427d2a..0f2673c 100644 --- a/build-aux/texinfo.tex +++ b/build-aux/texinfo.tex @@ -3,11 +3,11 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2013-06-23.10} +\def\texinfoversion{2014-03-17.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 Free Software Foundation, Inc. +% 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc. % % This texinfo.tex file is free software: you can redistribute it and/or % modify it under the terms of the GNU General Public License as @@ -281,9 +281,9 @@ \toks6=\expandafter{\prevsectiondefs}% \toks8=\expandafter{\lastcolordefs}% \mark{% - \the\toks0 \the\toks2 - \noexpand\or \the\toks4 \the\toks6 - \noexpand\else \the\toks8 + \the\toks0 \the\toks2 % 0: top marks (\last...) + \noexpand\or \the\toks4 \the\toks6 % 1: bottom marks (default, \prev...) + \noexpand\else \the\toks8 % 2: color marks }% } % \topmark doesn't work for the very first chapter (after the title @@ -322,10 +322,13 @@ % % Do this outside of the \shipout so @code etc. will be expanded in % the headline as they should be, not taken literally (outputting ''code). + \def\commmonheadfootline{\let\hsize=\pagewidth \texinfochars} + % \ifodd\pageno \getoddheadingmarks \else \getevenheadingmarks \fi - \setbox\headlinebox = \vbox{\let\hsize=\pagewidth \makeheadline}% + \global\setbox\headlinebox = \vbox{\commmonheadfootline \makeheadline}% + % \ifodd\pageno \getoddfootingmarks \else \getevenfootingmarks \fi - \setbox\footlinebox = \vbox{\let\hsize=\pagewidth \makefootline}% + \global\setbox\footlinebox = \vbox{\commmonheadfootline \makefootline}% % {% % Have to do this stuff outside the \shipout because we want it to @@ -1135,10 +1138,12 @@ \ifpdf % - % Color manipulation macros based on pdfcolor.tex, + % Color manipulation macros using ideas from pdfcolor.tex, % except using rgb instead of cmyk; the latter is said to render as a % very dark gray on-screen and a very dark halftone in print, instead - % of actual black. + % of actual black. The dark red here is dark enough to print on paper as + % nearly black, but still distinguishable for online viewing. We use + % black by default, though. \def\rgbDarkRed{0.50 0.09 0.12} \def\rgbBlack{0 0 0} % @@ -1248,10 +1253,9 @@ % used to mark target names; must be expandable. \def\pdfmkpgn#1{#1} % - % by default, use a color that is dark enough to print on paper as - % nearly black, but still distinguishable for online viewing. - \def\urlcolor{\rgbDarkRed} - \def\linkcolor{\rgbDarkRed} + % by default, use black for everything. + \def\urlcolor{\rgbBlack} + \def\linkcolor{\rgbBlack} \def\endlink{\setcolor{\maincolor}\pdfendlink} % % Adding outlines to PDF; macros for calculating structure of outlines @@ -2377,8 +2381,10 @@ \ifx\next,% \else\ifx\next-% \else\ifx\next.% + \else\ifx\next\.% + \else\ifx\next\comma% \else\ptexslash - \fi\fi\fi + \fi\fi\fi\fi\fi \aftersmartic } @@ -2519,7 +2525,9 @@ \ifx\codedashprev\codedash \else \discretionary{}{}{}\fi \fi - \global\let\codedashprev=\next + % we need the space after the = for the case when \next itself is a + % space token; it would get swallowed otherwise. As in @code{- a}. + \global\let\codedashprev= \next } } \def\normaldash{-} @@ -2567,37 +2575,21 @@ \let\file=\code \let\option=\code -% @uref (abbreviation for `urlref') takes an optional (comma-separated) -% second argument specifying the text to display and an optional third -% arg as text to display instead of (rather than in addition to) the url -% itself. First (mandatory) arg is the url. -% (This \urefnobreak definition isn't used now, leaving it for a while -% for comparison.) -\def\urefnobreak#1{\dourefnobreak #1,,,\finish} -\def\dourefnobreak#1,#2,#3,#4\finish{\begingroup - \unsepspaces - \pdfurl{#1}% - \setbox0 = \hbox{\ignorespaces #3}% - \ifdim\wd0 > 0pt - \unhbox0 % third arg given, show only that - \else - \setbox0 = \hbox{\ignorespaces #2}% - \ifdim\wd0 > 0pt - \ifpdf - \unhbox0 % PDF: 2nd arg given, show only it - \else - \unhbox0\ (\code{#1})% DVI: 2nd arg given, show both it and url - \fi - \else - \code{#1}% only url given, so show it - \fi - \fi - \endlink -\endgroup} +% @uref (abbreviation for `urlref') aka @url takes an optional +% (comma-separated) second argument specifying the text to display and +% an optional third arg as text to display instead of (rather than in +% addition to) the url itself. First (mandatory) arg is the url. + +% TeX-only option to allow changing PDF output to show only the second +% arg (if given), and not the url (which is then just the link target). +\newif\ifurefurlonlylink -% This \urefbreak definition is the active one. +% The main macro is \urefbreak, which allows breaking at expected +% places within the url. (There used to be another version, which +% didn't support automatic breaking.) \def\urefbreak{\begingroup \urefcatcodes \dourefbreak} \let\uref=\urefbreak +% \def\dourefbreak#1{\urefbreakfinish #1,,,\finish} \def\urefbreakfinish#1,#2,#3,#4\finish{% doesn't work in @example \unsepspaces @@ -2606,12 +2598,19 @@ \ifdim\wd0 > 0pt \unhbox0 % third arg given, show only that \else - \setbox0 = \hbox{\ignorespaces #2}% + \setbox0 = \hbox{\ignorespaces #2}% look for second arg \ifdim\wd0 > 0pt \ifpdf - \unhbox0 % PDF: 2nd arg given, show only it + \ifurefurlonlylink + % PDF plus option to not display url, show just arg + \unhbox0 + \else + % PDF, normally display both arg and url for consistency, + % visibility, if the pdf is eventually used to print, etc. + \unhbox0\ (\urefcode{#1})% + \fi \else - \unhbox0\ (\urefcode{#1})% DVI: 2nd arg given, show both it and url + \unhbox0\ (\urefcode{#1})% DVI, always show arg and url \fi \else \urefcode{#1}% only url given, so show it @@ -2651,8 +2650,10 @@ % we put a little stretch before and after the breakable chars, to help % line breaking of long url's. The unequal skips make look better in % cmtt at least, especially for dots. -\def\urefprestretch{\urefprebreak \hskip0pt plus.13em } -\def\urefpoststretch{\urefpostbreak \hskip0pt plus.1em } +\def\urefprestretchamount{.13em} +\def\urefpoststretchamount{.1em} +\def\urefprestretch{\urefprebreak \hskip0pt plus\urefprestretchamount\relax} +\def\urefpoststretch{\urefpostbreak \hskip0pt plus\urefprestretchamount\relax} % \def\urefcodeamp{\urefprestretch \&\urefpoststretch} \def\urefcodedot{\urefprestretch .\urefpoststretch} @@ -2887,6 +2888,15 @@ \def\inlinefmtname{#1}% \ifx\inlinefmtname\outfmtnametex \ignorespaces #2\fi } +% +% @inlinefmtifelse{FMTNAME,THEN-TEXT,ELSE-TEXT} expands THEN-TEXT if +% FMTNAME is tex, else ELSE-TEXT. +\long\def\inlinefmtifelse#1{\doinlinefmtifelse #1,,,\finish} +\long\def\doinlinefmtifelse#1,#2,#3,#4,\finish{% + \def\inlinefmtname{#1}% + \ifx\inlinefmtname\outfmtnametex \ignorespaces #2\else \ignorespaces #3\fi +} +% % For raw, must switch into @tex before parsing the argument, to avoid % setting catcodes prematurely. Doing it this way means that, for % example, @inlineraw{html, foo{bar} gets a parse error instead of being @@ -2903,6 +2913,23 @@ \endgroup % close group opened by \tex. } +% @inlineifset{VAR, TEXT} expands TEXT if VAR is @set. +% +\long\def\inlineifset#1{\doinlineifset #1,\finish} +\long\def\doinlineifset#1,#2,\finish{% + \def\inlinevarname{#1}% + \expandafter\ifx\csname SET\inlinevarname\endcsname\relax + \else\ignorespaces#2\fi +} + +% @inlineifclear{VAR, TEXT} expands TEXT if VAR is not @set. +% +\long\def\inlineifclear#1{\doinlineifclear #1,\finish} +\long\def\doinlineifclear#1,#2,\finish{% + \def\inlinevarname{#1}% + \expandafter\ifx\csname SET\inlinevarname\endcsname\relax \ignorespaces#2\fi +} + \message{glyphs,} % and logos. @@ -3658,7 +3685,7 @@ \parskip=\smallskipamount \ifdim\parskip=0pt \parskip=2pt \fi % - % Try typesetting the item mark that if the document erroneously says + % Try typesetting the item mark so that if the document erroneously says % something like @itemize @samp (intending @table), there's an error % right away at the @itemize. It's not the best error message in the % world, but it's better than leaving it to the @item. This means if @@ -3908,19 +3935,23 @@ } % multitable-only commands. -% -% @headitem starts a heading row, which we typeset in bold. -% Assignments have to be global since we are inside the implicit group -% of an alignment entry. \everycr resets \everytab so we don't have to +% +% @headitem starts a heading row, which we typeset in bold. Assignments +% have to be global since we are inside the implicit group of an +% alignment entry. \everycr below resets \everytab so we don't have to % undo it ourselves. \def\headitemfont{\b}% for people to use in the template row; not changeable \def\headitem{% \checkenv\multitable \crcr + \gdef\headitemcrhook{\nobreak}% attempt to avoid page break after headings \global\everytab={\bf}% can't use \headitemfont since the parsing differs \the\everytab % for the first item }% % +% default for tables with no headings. +\let\headitemcrhook=\relax +% % A \tab used to include \hskip1sp. But then the space in a template % line is not enough. That is bad. So let's go back to just `&' until % we again encounter the problem the 1sp was intended to solve. @@ -3951,15 +3982,15 @@ % \everycr = {% \noalign{% - \global\everytab={}% + \global\everytab={}% Reset from possible headitem. \global\colcount=0 % Reset the column counter. - % Check for saved footnotes, etc. + % + % Check for saved footnotes, etc.: \checkinserts - % Keeps underfull box messages off when table breaks over pages. - %\filbreak - % Maybe so, but it also creates really weird page breaks when the - % table breaks over pages. Wouldn't \vfil be better? Wait until the - % problem manifests itself, so it can be fixed for real --karl. + % + % Perhaps a \nobreak, then reset: + \headitemcrhook + \global\let\headitemcrhook=\relax }% }% % @@ -4198,7 +4229,7 @@ \def\value{\begingroup\makevalueexpandable\valuexxx} \def\valuexxx#1{\expandablevalue{#1}\endgroup} { - \catcode`\- = \active \catcode`\_ = \active + \catcode`\-=\active \catcode`\_=\active % \gdef\makevalueexpandable{% \let\value = \expandablevalue @@ -4218,7 +4249,12 @@ % variable's value contains other Texinfo commands, it's almost certain % it will fail (although perhaps we could fix that with sufficient work % to do a one-level expansion on the result, instead of complete). -% +% +% Unfortunately, this has the consequence that when _ is in the *value* +% of an @set, it does not print properly in the roman fonts (get the cmr +% dot accent at position 126 instead). No fix comes to mind, and it's +% been this way since 2003 or earlier, so just ignore it. +% \def\expandablevalue#1{% \expandafter\ifx\csname SET#1\endcsname\relax {[No value for ``#1'']}% @@ -4396,7 +4432,7 @@ % complicated, when \tex is in effect and \{ is a \delimiter again. % We can't use \lbracecmd and \rbracecmd because texindex assumes % braces and backslashes are used only as delimiters. Perhaps we - % should define @lbrace and @rbrace commands a la @comma. + % should use @lbracechar and @rbracechar? \def\{{{\tt\char123}}% \def\}{{\tt\char125}}% % @@ -4417,8 +4453,7 @@ % @end macro % ... % @funindex commtest - % - % The above is not enough to reproduce the bug, but it gives the flavor. + % This is not enough to reproduce the bug, but it gives the flavor. % % Sample whatsit resulting: % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}} @@ -4619,8 +4654,21 @@ \definedummyword\verb \definedummyword\w \definedummyword\xref + % + % Consider: + % @macro mkind{arg1,arg2} + % @cindex \arg2\ + % @end macro + % @mkind{foo, bar} + % The space after the comma will end up in the temporary definition + % that we make for arg2 (see \parsemargdef ff.). We want all this to be + % expanded for the sake of the index, so we end up just seeing "bar". + \let\xeatspaces = \eatspaces } +% For testing: output @{ and @} in index sort strings as \{ and \}. +\newif\ifusebracesinindexes + % \indexnofonts is used when outputting the strings to sort the index % by, and when constructing control sequence names. It eliminates all % control sequences and just writes whatever the best ASCII sort string @@ -4649,11 +4697,16 @@ % Unfortunately, texindex is not prepared to handle braces in the % content at all. So for index sorting, we map @{ and @} to strings % starting with |, since that ASCII character is between ASCII { and }. - \def\{{|a}% - \def\lbracechar{|a}% + \ifusebracesinindexes + \def\lbracechar{\lbracecmd}% + \def\rbracechar{\rbracecmd}% + \else + \def\lbracechar{|a}% + \def\rbracechar{|b}% + \fi + \let\{=\lbracechar + \let\}=\rbracechar % - \def\}{|b}% - \def\rbracechar{|b}% % % Non-English letters. \def\AA{AA}% @@ -5905,7 +5958,7 @@ % % Now the second mark, after the heading break. No break points % between here and the heading. - \let\prevsectiondefs=\lastsectiondefs + \global\let\prevsectiondefs=\lastsectiondefs \domark % % Only insert the space after the number if we have a section number. @@ -6272,8 +6325,8 @@ \catcode `\|=\other \catcode `\<=\other \catcode `\>=\other - \catcode`\`=\other - \catcode`\'=\other + \catcode `\`=\other + \catcode `\'=\other \escapechar=`\\ % % ' is active in math mode (mathcode"8000). So reset it, and all our @@ -6297,7 +6350,7 @@ \let\/=\ptexslash \let\*=\ptexstar \let\t=\ptext - \expandafter \let\csname top\endcsname=\ptextop % outer + \expandafter \let\csname top\endcsname=\ptextop % we've made it outer \let\frenchspacing=\plainfrenchspacing % \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}% @@ -6381,8 +6434,6 @@ % side, and for 6pt waste from % each corner char, and rule thickness \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip - % Flag to tell @lisp, etc., not to narrow margin. - \let\nonarrowing = t% % % If this cartouche directly follows a sectioning command, we need the % \parskip glue (backspaced over by default) or the cartouche can @@ -6549,9 +6600,13 @@ % @raggedright does more-or-less normal line breaking but no right -% justification. From plain.tex. +% justification. From plain.tex. Don't stretch around special +% characters in urls in this environment, since the stretch at the right +% should be enough. \envdef\raggedright{% - \rightskip0pt plus2em \spaceskip.3333em \xspaceskip.5em\relax + \rightskip0pt plus2.4em \spaceskip.3333em \xspaceskip.5em\relax + \def\urefprestretchamount{0pt}% + \def\urefpoststretchamount{0pt}% } \let\Eraggedright\par @@ -7444,7 +7499,7 @@ % Parse the optional {params} list. Set up \paramno and \paramlist % so \defmacro knows what to do. Define \macarg.BLAH for each BLAH -% in the params list to some hook where the argument si to be expanded. If +% in the params list to some hook where the argument is to be expanded. If % there are less than 10 arguments that hook is to be replaced by ##N where N % is the position in that list, that is to say the macro arguments are to be % defined `a la TeX in the macro body. @@ -8306,6 +8361,7 @@ \gdef\footnote{% \let\indent=\ptexindent \let\noindent=\ptexnoindent + % \global\advance\footnoteno by \@ne \edef\thisfootno{$^{\the\footnoteno}$}% % @@ -8329,6 +8385,11 @@ % \gdef\dofootnote{% \insert\footins\bgroup + % + % Nested footnotes are not supported in TeX, that would take a lot + % more work. (\startsavinginserts does not suffice.) + \let\footnote=\errfootnote + % % We want to typeset this text as a normal paragraph, even if the % footnote reference occurs in (for example) a display environment. % So reset some parameters. @@ -8366,13 +8427,19 @@ } }%end \catcode `\@=11 +\def\errfootnote{% + \errhelp=\EMsimple + \errmessage{Nested footnotes not supported in texinfo.tex, + even though they work in makeinfo; sorry} +} + % In case a @footnote appears in a vbox, save the footnote text and create % the real \insert just after the vbox finished. Otherwise, the insertion % would be lost. % Similarly, if a @footnote appears inside an alignment, save the footnote % text to a box and make the \insert when a row of the table is finished. % And the same can be done for other insert classes. --kasal, 16nov03. - +% % Replace the \insert primitive by a cheating macro. % Deeper inside, just make sure that the saved insertions are not spilled % out prematurely. @@ -9940,11 +10007,9 @@ \catcode`\"=\active \def\activedoublequote{{\tt\char34}} \let"=\activedoublequote -\catcode`\~=\active -\def~{{\tt\char126}} +\catcode`\~=\active \def\activetilde{{\tt\char126}} \let~ = \activetilde \chardef\hat=`\^ -\catcode`\^=\active -\def^{{\tt \hat}} +\catcode`\^=\active \def\activehat{{\tt \hat}} \let^ = \activehat \catcode`\_=\active \def_{\ifusingtt\normalunderscore\_} @@ -9954,16 +10019,26 @@ \catcode`\|=\active \def|{{\tt\char124}} + \chardef \less=`\< -\catcode`\<=\active -\def<{{\tt \less}} +\catcode`\<=\active \def\activeless{{\tt \less}}\let< = \activeless \chardef \gtr=`\> -\catcode`\>=\active -\def>{{\tt \gtr}} -\catcode`\+=\active -\def+{{\tt \char 43}} -\catcode`\$=\active -\def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix +\catcode`\>=\active \def\activegtr{{\tt \gtr}}\let> = \activegtr +\catcode`\+=\active \def+{{\tt \char 43}} +\catcode`\$=\active \def${\ifusingit{{\sl\$}}\normaldollar}%$ font-lock fix + +% used for headline/footline in the output routine, in case the page +% breaks in the middle of an @tex block. +\def\texinfochars{% + \let< = \activeless + \let> = \activegtr + \let~ = \activetilde + \let^ = \activehat + \markupsetuplqdefault \markupsetuprqdefault + \let\b = \strong + \let\i = \smartitalic + % in principle, all other definitions in \tex have to be undone too. +} % If a .fmt file is being used, characters that might appear in a file % name cannot be active until we have parsed the command line. diff --git a/build-aux/ylwrap b/build-aux/ylwrap index 7befa46..8f072a8 100755 --- a/build-aux/ylwrap +++ b/build-aux/ylwrap @@ -1,9 +1,9 @@ #! /bin/sh # ylwrap - wrapper for lex/yacc invocations. -scriptversion=2012-07-14.08; # UTC +scriptversion=2013-01-12.17; # UTC -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # Written by Tom Tromey . # @@ -40,12 +40,13 @@ get_dirname () # guard FILE # ---------- # The CPP macro used to guard inclusion of FILE. -guard() +guard () { - printf '%s\n' "$from" \ - | sed \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'\ - -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g' + printf '%s\n' "$1" \ + | sed \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/' \ + -e 's/[^ABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g' \ + -e 's/__*/_/g' } # quote_for_sed [STRING] @@ -95,17 +96,17 @@ esac # The input. -input="$1" +input=$1 shift # We'll later need for a correct munging of "#line" directives. input_sub_rx=`get_dirname "$input" | quote_for_sed` -case "$input" in +case $input in [\\/]* | ?:[\\/]*) # Absolute path; do nothing. ;; *) # Relative path. Make it absolute. - input="`pwd`/$input" + input=`pwd`/$input ;; esac input_rx=`get_dirname "$input" | quote_for_sed` @@ -121,12 +122,18 @@ fi # The parser itself, the first file, is the destination of the .y.c # rule in the Makefile. parser=$1 + # A sed program to s/FROM/TO/g for all the FROM/TO so that, for # instance, we rename #include "y.tab.h" into #include "parse.h" # during the conversion from y.tab.c to parse.c. -rename_sed= -while test "$#" -ne 0; do - if test "$1" = "--"; then +sed_fix_filenames= + +# Also rename header guards, as Bison 2.7 for instance uses its header +# guard in its implementation file. +sed_fix_header_guards= + +while test $# -ne 0; do + if test x"$1" = x"--"; then shift break fi @@ -141,20 +148,19 @@ while test "$#" -ne 0; do shift to=$1 shift - rename_sed="${rename_sed}s|"`quote_for_sed "$from"`"|$to|g;" + sed_fix_filenames="${sed_fix_filenames}s|"`quote_for_sed "$from"`"|$to|g;" + sed_fix_header_guards="${sed_fix_header_guards}s|"`guard "$from"`"|"`guard "$to"`"|g;" done # The program to run. -prog="$1" +prog=$1 shift # Make any relative path in $prog absolute. -case "$prog" in +case $prog in [\\/]* | ?:[\\/]*) ;; - *[\\/]*) prog="`pwd`/$prog" ;; + *[\\/]*) prog=`pwd`/$prog ;; esac -# FIXME: add hostname here for parallel makes that run commands on -# other machines. But that might take us over the 14-char limit. dirname=ylwrap$$ do_exit="cd '`pwd`' && rm -rf $dirname > /dev/null 2>&1;"' (exit $ret); exit $ret' trap "ret=129; $do_exit" 1 @@ -174,13 +180,13 @@ ret=$? if test $ret -eq 0; then for from in * do - to=`printf '%s\n' "$from" | sed "$rename_sed"` + to=`printf '%s\n' "$from" | sed "$sed_fix_filenames"` if test -f "$from"; then # If $2 is an absolute path name, then just use that, # otherwise prepend '../'. case $to in [\\/]* | ?:[\\/]*) target=$to;; - *) target="../$to";; + *) target=../$to;; esac # Do not overwrite unchanged header files to avoid useless @@ -189,7 +195,7 @@ if test $ret -eq 0; then # output of all other files to a temporary file so we can # compare them to existing versions. if test $from != $parser; then - realtarget="$target" + realtarget=$target target=tmp-`printf '%s\n' "$target" | sed 's|.*[\\/]||g'` fi @@ -197,10 +203,11 @@ if test $ret -eq 0; then # debug information point at an absolute srcdir. Use the real # output file name, not yy.lex.c for instance. Adjust the # include guards too. - FROM=`guard "$from"` - TARGET=`guard "$to"` - sed -e "/^#/!b" -e "s|$input_rx|$input_sub_rx|" -e "$rename_sed" \ - -e "s|$FROM|$TARGET|" "$from" >"$target" || ret=$? + sed -e "/^#/!b" \ + -e "s|$input_rx|$input_sub_rx|" \ + -e "$sed_fix_filenames" \ + -e "$sed_fix_header_guards" \ + "$from" >"$target" || ret=$? # Check whether files must be updated. if test "$from" != "$parser"; then diff --git a/config.h.in b/config.h.in index e213790..6646ea5 100644 --- a/config.h.in +++ b/config.h.in @@ -126,6 +126,14 @@ /* Define to 1 if futimesat mishandles a NULL file name. */ #undef FUTIMESAT_NULL_BUG +/* Define to the type of elements in the array set by `getgroups'. Usually + this is either `int' or `gid_t'. */ +#undef GETGROUPS_T + +/* Define this to 1 if getgroups(0,NULL) does not return the number of groups. + */ +#undef GETGROUPS_ZERO_BUG + /* Define if gettimeofday clobbers the localtime buffer. */ #undef GETTIMEOFDAY_CLOBBERS_LOCALTIME @@ -153,6 +161,10 @@ whether the gnulib module dirname shall be considered present. */ #undef GNULIB_DIRNAME +/* Define to a C preprocessor expression that evaluates to 1 or 0, depending + whether the gnulib module faccessat shall be considered present. */ +#undef GNULIB_FACCESSAT + /* Define to a C preprocessor expression that evaluates to 1 or 0, depending whether the gnulib module fchmodat shall be considered present. */ #undef GNULIB_FCHMODAT @@ -246,6 +258,12 @@ /* Define to 1 when the gnulib module environ should be tested. */ #undef GNULIB_TEST_ENVIRON +/* Define to 1 when the gnulib module euidaccess should be tested. */ +#undef GNULIB_TEST_EUIDACCESS + +/* Define to 1 when the gnulib module faccessat should be tested. */ +#undef GNULIB_TEST_FACCESSAT + /* Define to 1 when the gnulib module fchdir should be tested. */ #undef GNULIB_TEST_FCHDIR @@ -285,6 +303,9 @@ /* Define to 1 when the gnulib module getdtablesize should be tested. */ #undef GNULIB_TEST_GETDTABLESIZE +/* Define to 1 when the gnulib module getgroups should be tested. */ +#undef GNULIB_TEST_GETGROUPS + /* Define to 1 when the gnulib module getline should be tested. */ #undef GNULIB_TEST_GETLINE @@ -297,6 +318,12 @@ /* Define to 1 when the gnulib module gettimeofday should be tested. */ #undef GNULIB_TEST_GETTIMEOFDAY +/* Define to 1 when the gnulib module group-member should be tested. */ +#undef GNULIB_TEST_GROUP_MEMBER + +/* Define to 1 when the gnulib module isatty should be tested. */ +#undef GNULIB_TEST_ISATTY + /* Define to 1 when the gnulib module iswblank should be tested. */ #undef GNULIB_TEST_ISWBLANK @@ -378,6 +405,15 @@ /* Define to 1 when the gnulib module opendir should be tested. */ #undef GNULIB_TEST_OPENDIR +/* Define to 1 when the gnulib module posix_openpt should be tested. */ +#undef GNULIB_TEST_POSIX_OPENPT + +/* Define to 1 when the gnulib module ptsname should be tested. */ +#undef GNULIB_TEST_PTSNAME + +/* Define to 1 when the gnulib module ptsname_r should be tested. */ +#undef GNULIB_TEST_PTSNAME_R + /* Define to 1 when the gnulib module raise should be tested. */ #undef GNULIB_TEST_RAISE @@ -450,6 +486,9 @@ /* Define to 1 when the gnulib module strnlen should be tested. */ #undef GNULIB_TEST_STRNLEN +/* Define to 1 when the gnulib module strtoll should be tested. */ +#undef GNULIB_TEST_STRTOLL + /* Define to 1 when the gnulib module strtoull should be tested. */ #undef GNULIB_TEST_STRTOULL @@ -462,12 +501,18 @@ /* Define to 1 when the gnulib module time_r should be tested. */ #undef GNULIB_TEST_TIME_R +/* Define to 1 when the gnulib module ttyname_r should be tested. */ +#undef GNULIB_TEST_TTYNAME_R + /* Define to 1 when the gnulib module unlink should be tested. */ #undef GNULIB_TEST_UNLINK /* Define to 1 when the gnulib module unlinkat should be tested. */ #undef GNULIB_TEST_UNLINKAT +/* Define to 1 when the gnulib module unlockpt should be tested. */ +#undef GNULIB_TEST_UNLOCKPT + /* Define to 1 when the gnulib module unsetenv should be tested. */ #undef GNULIB_TEST_UNSETENV @@ -492,6 +537,9 @@ /* Define to the program name of gzip compressor program */ #undef GZIP_PROGRAM +/* Define to 1 if you have the `access' function. */ +#undef HAVE_ACCESS + /* Define to 1 if you have the `aclsort' function. */ #undef HAVE_ACLSORT @@ -772,6 +820,14 @@ don't. */ #undef HAVE_DECL_STRNLEN +/* Define to 1 if you have the declaration of `strtoimax', and to 0 if you + don't. */ +#undef HAVE_DECL_STRTOIMAX + +/* Define to 1 if you have the declaration of `strtoll', and to 0 if you + don't. */ +#undef HAVE_DECL_STRTOLL + /* Define to 1 if you have the declaration of `strtoull', and to 0 if you don't. */ #undef HAVE_DECL_STRTOULL @@ -788,6 +844,10 @@ don't. */ #undef HAVE_DECL_TOWLOWER +/* Define to 1 if you have the declaration of `ttyname_r', and to 0 if you + don't. */ +#undef HAVE_DECL_TTYNAME_R + /* Define to 1 if you have the declaration of `tzname', and to 0 if you don't. */ #undef HAVE_DECL_TZNAME @@ -825,9 +885,18 @@ /* Define to 1 if you have the 'dup2' function. */ #undef HAVE_DUP2 +/* Define to 1 if you have the `eaccess' function. */ +#undef HAVE_EACCESS + /* Define if you have the declaration of environ. */ #undef HAVE_ENVIRON_DECL +/* Define to 1 if you have the `euidaccess' function. */ +#undef HAVE_EUIDACCESS + +/* Define to 1 if you have the `faccessat' function. */ +#undef HAVE_FACCESSAT + /* Define to 1 if you have the `facl' function. */ #undef HAVE_FACL @@ -900,6 +969,9 @@ /* Define to 1 if you have the `getdtablesize' function. */ #undef HAVE_GETDTABLESIZE +/* Define to 1 if your system has a working `getgroups' function. */ +#undef HAVE_GETGROUPS + /* Define to 1 if you have the header file. */ #undef HAVE_GETOPT_H @@ -921,6 +993,9 @@ /* Define to 1 if you have the `getxattr' function. */ #undef HAVE_GETXATTR +/* Define to 1 if you have the `grantpt' function. */ +#undef HAVE_GRANTPT + /* Define to 1 if you have the header file. */ #undef HAVE_GRP_H @@ -973,6 +1048,12 @@ /* Define to 1 if you have the `lgetxattr' function. */ #undef HAVE_LGETXATTR +/* Define to 1 if you have the `attr' library (-lattr). */ +#undef HAVE_LIBATTR + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBGEN_H + /* Define to 1 if you have the header file. */ #undef HAVE_LIBINTL_H @@ -1019,6 +1100,9 @@ to 0 otherwise. */ #undef HAVE_MALLOC_GNU +/* Define to 1 if you have the header file. */ +#undef HAVE_MALLOC_H + /* Define if the 'malloc' function is POSIX compliant. */ #undef HAVE_MALLOC_POSIX @@ -1079,9 +1163,6 @@ /* Define to 1 if you have the `nanotime' function. */ #undef HAVE_NANOTIME -/* Define to 1 if you have the header file, and it defines `DIR'. */ -#undef HAVE_NDIR_H - /* Define to 1 if you have the header file. */ #undef HAVE_NETDB_H @@ -1113,9 +1194,15 @@ /* Define to 1 if you have the `pipe' function. */ #undef HAVE_PIPE +/* Define if the ttyname_r function has a POSIX compliant declaration. */ +#undef HAVE_POSIXDECL_TTYNAME_R + /* Define when we have working POSIX acls */ #undef HAVE_POSIX_ACLS +/* Define to 1 if you have the `posix_openpt' function. */ +#undef HAVE_POSIX_OPENPT + /* Define to 1 if you have the header file. */ #undef HAVE_PRIV_H @@ -1125,6 +1212,12 @@ /* Define if program_invocation_short_name is defined */ #undef HAVE_PROGRAM_INVOCATION_SHORT_NAME +/* Define to 1 if you have the `ptsname' function. */ +#undef HAVE_PTSNAME + +/* Define to 1 if you have the `ptsname_r' function. */ +#undef HAVE_PTSNAME_R + /* Define to 1 if you have the header file. */ #undef HAVE_PWD_H @@ -1741,6 +1834,9 @@ /* Define to 1 if you have the `renameat' function. */ #undef HAVE_RENAMEAT +/* Define to 1 if you have the `revoke' function. */ +#undef HAVE_REVOKE + /* Define to 1 if you have the `rewinddir' function. */ #undef HAVE_REWINDDIR @@ -1762,6 +1858,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SELINUX_SELINUX_H +/* Define to 1 if you have the `setdtablesize' function. */ +#undef HAVE_SETDTABLESIZE + /* Define to 1 if you have the `setenv' function. */ #undef HAVE_SETENV @@ -1843,9 +1942,15 @@ /* Define to 1 if you have the `strnlen' function. */ #undef HAVE_STRNLEN +/* Define to 1 if you have the `strtoimax' function. */ +#undef HAVE_STRTOIMAX + /* Define to 1 if you have the `strtol' function. */ #undef HAVE_STRTOL +/* Define to 1 if you have the `strtoll' function. */ +#undef HAVE_STRTOLL + /* Define to 1 if you have the `strtoul' function. */ #undef HAVE_STRTOUL @@ -1924,10 +2029,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_DEVICE_H -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#undef HAVE_SYS_DIR_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_GENTAPE_H @@ -1946,10 +2047,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_MTIO_H -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#undef HAVE_SYS_NDIR_H - /* Define to 1 if you have the header file. */ #undef HAVE_SYS_PARAM_H @@ -1977,6 +2074,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SYS_WAIT_H +/* define to 1 if we have header */ +#undef HAVE_SYS_XATTR_H + /* Define if struct tm has the tm_gmtoff member. */ #undef HAVE_TM_GMTOFF @@ -1990,16 +2090,28 @@ /* Define to 1 if you have the `tsearch' function. */ #undef HAVE_TSEARCH +/* Define to 1 if you have the `ttyname' function. */ +#undef HAVE_TTYNAME + +/* Define to 1 if you have the `ttyname_r' function. */ +#undef HAVE_TTYNAME_R + /* Define to 1 if you don't have `tm_zone' but do have the external array `tzname'. */ #undef HAVE_TZNAME +/* Define to 1 if you have the `tzset' function. */ +#undef HAVE_TZSET + /* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H /* Define to 1 if you have the `unlinkat' function. */ #undef HAVE_UNLINKAT +/* Define to 1 if you have the `unlockpt' function. */ +#undef HAVE_UNLOCKPT + /* Define to 1 if you have the `unsetenv' function. */ #undef HAVE_UNSETENV @@ -2033,9 +2145,6 @@ /* Define to 1 if you have the `wcrtomb' function. */ #undef HAVE_WCRTOMB -/* Define to 1 if you have the `wcscoll' function. */ -#undef HAVE_WCSCOLL - /* Define to 1 if you have the `wcslen' function. */ #undef HAVE_WCSLEN @@ -2094,15 +2203,15 @@ /* Define to 1 if you have the `_set_invalid_parameter_handler' function. */ #undef HAVE__SET_INVALID_PARAMETER_HANDLER -/* Define to 1 if you have the `__fpending' function. */ -#undef HAVE___FPENDING - /* Define to 1 if you have the `__secure_getenv' function. */ #undef HAVE___SECURE_GETENV /* Define as const if the declaration of iconv() needs const. */ #undef ICONV_CONST +/* Define to 1 if isatty() may fail without setting errno. */ +#undef ISATTY_FAILS_WITHOUT_SETTING_ERRNO + /* Define to 1 if linkat fails to recognize a trailing slash. */ #undef LINKAT_TRAILING_SLASH_BUG @@ -2162,9 +2271,6 @@ /* Define to mt_model (v.g., for DG/UX), else to mt_type. */ #undef MTIO_CHECK_FIELD -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Define to 1 if open() fails to recognize a trailing slash. */ #undef OPEN_TRAILING_SLASH_BUG @@ -2258,9 +2364,6 @@ /* Define if vasnprintf exists but is overridden by gnulib. */ #undef REPLACE_VASNPRINTF -/* Define as the return type of signal handlers (`int' or `void'). */ -#undef RETSIGTYPE - /* Define to l, ll, u, ul, ull, etc., as suitable for constants of type 'sig_atomic_t'. */ #undef SIG_ATOMIC_T_SUFFIX @@ -2451,27 +2554,41 @@ 'reference to static identifier "f" in extern inline function'. This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16. - Suppress the use of extern inline on Apple's platforms, as Libc at least - through Libc-825.26 (2013-04-09) is incompatible with it; see, e.g., + Suppress the use of extern inline on problematic Apple configurations. + OS X 10.8 and earlier mishandle it; see, e.g., . + 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__ \ + && (defined __header_inline \ + ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \ + && ! defined __clang__) \ + : ((! defined _DONT_USE_CTYPE_INLINE_ \ + && (defined __GNUC__ || defined __cplusplus)) \ + || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \ + && defined __GNUC__ && ! defined __cplusplus)))) +# define _GL_EXTERN_INLINE_APPLE_BUG +#endif #if ((__GNUC__ \ ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ : (199901L <= __STDC_VERSION__ \ && !defined __HP_cc \ && !(defined __SUNPRO_C && __STDC__))) \ - && !defined __APPLE__) + && !defined _GL_EXTERN_INLINE_APPLE_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 __APPLE__) -# if __GNUC_GNU_INLINE__ + && !defined _GL_EXTERN_INLINE_APPLE_BUG) +# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__ /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ # define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) # else # define _GL_INLINE extern inline # endif # define _GL_EXTERN_INLINE extern +# define _GL_EXTERN_INLINE_IN_USE #else # define _GL_INLINE static _GL_UNUSED # define _GL_EXTERN_INLINE static _GL_UNUSED @@ -2515,9 +2632,6 @@ /* A replacement for va_copy, if needed. */ #define gl_va_copy(a,b) ((a) = (b)) -/* Define to rpl_gmtime if the replacement function should be used. */ -#undef gmtime - /* Conversion descriptor type */ #undef iconv_t @@ -2549,9 +2663,6 @@ /* Define to 1 if the compiler is checking for lint. */ #undef lint -/* Define to rpl_localtime if the replacement function should be used. */ -#undef localtime - /* Type of major device numbers. */ #undef major_t @@ -2564,6 +2675,9 @@ /* Define to `int' if does not define. */ #undef mode_t +/* Define to the name of the strftime replacement function. */ +#undef my_strftime + /* Define to the type of st_nlink in struct stat, or a supertype. */ #undef nlink_t diff --git a/configure b/configure index 8b3c4f7..cfdd721 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 tar 1.27. +# Generated by GNU Autoconf 2.69 for GNU tar 1.28. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GNU tar' PACKAGE_TARNAME='tar' -PACKAGE_VERSION='1.27' -PACKAGE_STRING='GNU tar 1.27' +PACKAGE_VERSION='1.28' +PACKAGE_STRING='GNU tar 1.28' PACKAGE_BUGREPORT='bug-tar@gnu.org' PACKAGE_URL='http://www.gnu.org/software/tar/' @@ -652,6 +652,7 @@ GMSGFMT MSGFMT GETTEXT_MACRO_VERSION USE_NLS +SED LTLIBICONV LIBICONV DEFAULT_QUOTING_STYLE @@ -660,12 +661,18 @@ DEFAULT_ARCHIVE DEFAULT_ARCHIVE_FORMAT RSH LIBOBJS +TAR_COND_GRANTPT_FALSE +TAR_COND_GRANTPT_TRUE +TAR_LIB_ATTR_FALSE +TAR_LIB_ATTR_TRUE TAR_COND_XATTR_H_FALSE TAR_COND_XATTR_H_TRUE GNULIB_TEST_WARN_CFLAGS GNULIB_WARN_CFLAGS WARN_CFLAGS WERROR_CFLAGS +PU_RMT_COND_FALSE +PU_RMT_COND_TRUE DEFAULT_RMT_COMMAND DEFAULT_RMT_DIR PU_RMT_PROG @@ -745,6 +752,8 @@ HAVE__BOOL GL_GENERATE_STDBOOL_H_FALSE GL_GENERATE_STDBOOL_H_TRUE STDBOOL_H +REPLACE_LOCALTIME +REPLACE_GMTIME REPLACE_TIMEGM REPLACE_NANOSLEEP REPLACE_MKTIME @@ -888,6 +897,7 @@ PRIPTR_PREFIX PRI_MACROS_BROKEN INT64_MAX_EQ_LONG_MAX INT32_MAX_LT_INTMAX_MAX +REPLACE_STRTOUMAX REPLACE_STRTOIMAX HAVE_DECL_STRTOUMAX HAVE_DECL_STRTOIMAX @@ -1099,6 +1109,7 @@ GNULIB_FUTIMENS GNULIB_FSTATAT GNULIB_FSTAT GNULIB_FCHMODAT +LIB_EACCESS EOVERFLOW_VALUE EOVERFLOW_HIDDEN ENOLINK_VALUE @@ -1118,6 +1129,7 @@ PRAGMA_SYSTEM_HEADER INCLUDE_NEXT_AS_FIRST_DIRECTIVE INCLUDE_NEXT pkglibexecdir +runstatedir lispdir REPLACE_FDOPENDIR REPLACE_DIRFD @@ -1165,6 +1177,7 @@ REPLACE_ISATTY REPLACE_GETPAGESIZE REPLACE_GETGROUPS REPLACE_GETLOGIN_R +REPLACE_GETDTABLESIZE REPLACE_GETDOMAINNAME REPLACE_GETCWD REPLACE_FTRUNCATE @@ -1445,6 +1458,7 @@ ALLOCA_H ALLOCA GL_COND_LIBTOOL_FALSE GL_COND_LIBTOOL_TRUE +ac_ct_AR ARFLAGS AR EGREP @@ -2122,7 +2136,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 tar 1.27 to adapt to many kinds of systems. +\`configure' configures GNU tar 1.28 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2192,7 +2206,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU tar 1.27:";; + short | recursive ) echo "Configuration of GNU tar 1.28:";; esac cat <<\_ACEOF @@ -2342,7 +2356,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU tar configure 1.27 +GNU tar configure 1.28 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3051,7 +3065,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 tar $as_me 1.27, which was +It was created by GNU tar $as_me 1.28, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3366,6 +3380,7 @@ as_fn_append ac_header_list " sys/socket.h" as_fn_append ac_func_list " fchdir" as_fn_append ac_header_list " dirent.h" as_fn_append ac_func_list " fdopendir" +as_fn_append ac_func_list " faccessat" as_fn_append ac_func_list " fchmodat" as_fn_append ac_func_list " lchmod" as_fn_append ac_func_list " fcntl" @@ -3380,7 +3395,6 @@ as_fn_append ac_func_list " wmempcpy" as_fn_append ac_header_list " wctype.h" gl_fnmatch_required=GNU as_fn_append ac_header_list " stdio_ext.h" -as_fn_append ac_func_list " __fpending" as_fn_append ac_header_list " sys/stat.h" as_fn_append ac_func_list " fstatat" as_fn_append ac_func_list " futimens" @@ -3411,8 +3425,11 @@ as_fn_append ac_func_list " mkfifoat" as_fn_append ac_func_list " mknodat" as_fn_append ac_func_list " mknod" as_fn_append ac_func_list " nl_langinfo" +as_fn_append ac_func_list " posix_openpt" as_fn_append ac_header_list " priv.h" -as_fn_append ac_func_list " wcscoll" +as_fn_append ac_func_list " ptsname_r" +as_fn_append ac_func_list " fchmod" +as_fn_append ac_header_list " malloc.h" as_fn_append ac_func_list " renameat" as_fn_append ac_func_list " secure_getenv" as_fn_append ac_header_list " selinux/selinux.h" @@ -3420,8 +3437,10 @@ as_fn_append ac_func_list " setenv" as_fn_append ac_func_list " sleep" as_fn_append ac_func_list " snprintf" as_fn_append ac_func_list " strdup" +as_fn_append ac_func_list " tzset" as_fn_append ac_header_list " strings.h" as_fn_append ac_func_list " strndup" +as_fn_append ac_func_list " strtoimax" as_fn_append ac_func_list " strtoumax" as_fn_append ac_func_list " symlinkat" as_fn_append ac_header_list " sysexits.h" @@ -3441,8 +3460,8 @@ as_fn_append ac_header_list " sys/wait.h" as_fn_append ac_header_list " pwd.h" as_fn_append ac_header_list " grp.h" as_fn_append ac_func_list " setlocale" -as_fn_append ac_func_list " fchmod" as_fn_append ac_func_list " fsync" +as_fn_append ac_func_list " grantpt" gt_needs="$gt_needs need-formatstring-macros" # Check that the precious variables saved in the cache have kept the same # value. @@ -3545,7 +3564,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. ac_config_headers="$ac_config_headers config.h" -am__api_version='1.12' +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3729,8 +3748,8 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 @@ -4031,7 +4050,7 @@ fi # Define the identity of the package. PACKAGE='tar' - VERSION='1.27' + VERSION='1.28' cat >>confdefs.h <<_ACEOF @@ -4072,86 +4091,125 @@ mkdir_p='$(MKDIR_P)' AMTAR='$${TAR-tar}' -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 -$as_echo_n "checking how to create a ustar tar archive... " >&6; } -# Loop over all known methods to create a tar archive until one works. +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar plaintar pax cpio none' -_am_tools=${am_cv_prog_tar_ustar-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of '-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - { echo "$as_me:$LINENO: $_am_tar --version" >&5 + +# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether UID '$am_uid' is supported by ustar format" >&5 +$as_echo_n "checking whether UID '$am_uid' is supported by ustar format... " >&6; } + if test $am_uid -le $am_max_uid; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + _am_tools=none + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GID '$am_gid' is supported by ustar format" >&5 +$as_echo_n "checking whether GID '$am_gid' is supported by ustar format... " >&6; } + if test $am_gid -le $am_max_gid; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + _am_tools=none + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 +$as_echo_n "checking how to create a ustar tar archive... " >&6; } + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_ustar-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + { echo "$as_me:$LINENO: $_am_tar --version" >&5 ($_am_tar --version) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && break - done - am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x ustar -w "$$tardir"' - am__tar_='pax -L -x ustar -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H ustar -L' - am__tar_='find "$tardir" -print | cpio -o -H ustar -L' - am__untar='cpio -i -H ustar -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac + done + am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x ustar -w "$$tardir"' + am__tar_='pax -L -x ustar -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H ustar -L' + am__tar_='find "$tardir" -print | cpio -o -H ustar -L' + am__untar='cpio -i -H ustar -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_ustar}" && break + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_ustar}" && break - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } - rm -rf conftest.dir - if test -s conftest.tar; then - { echo "$as_me:$LINENO: $am__untar &5 + rm -rf conftest.dir + if test -s conftest.tar; then + { echo "$as_me:$LINENO: $am__untar &5 ($am__untar &5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break - fi -done -rm -rf conftest.dir + { echo "$as_me:$LINENO: cat conftest.dir/file" >&5 + (cat conftest.dir/file) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi + done + rm -rf conftest.dir -if ${am_cv_prog_tar_ustar+:} false; then : + if ${am_cv_prog_tar_ustar+:} false; then : $as_echo_n "(cached) " >&6 else am_cv_prog_tar_ustar=$_am_tool fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 $as_echo "$am_cv_prog_tar_ustar" >&6; } @@ -4159,6 +4217,48 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; } +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + # Enable silent rules by default: # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : @@ -4200,6 +4300,69 @@ fi AM_BACKSLASH='\' +DEPDIR="${am__leading_dot}deps" + +ac_config_commands="$ac_config_commands depfiles" + + +am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } +rm -f confinc confmf + +# Check whether --enable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then : + enableval=$enable_dependency_tracking; +fi + +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= +fi + + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -4988,68 +5151,64 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -DEPDIR="${am__leading_dot}deps" - -ac_config_commands="$ac_config_commands depfiles" - - -am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 -$as_echo_n "checking for style of include used by $am_make... " >&6; } -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from 'make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 -$as_echo "$_am_result" >&6; } -rm -f confinc confmf +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ -# Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then : - enableval=$enable_dependency_tracking; -fi +int +main () +{ -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' - am__nodep='_no' + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i fi - if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' -else - AMDEP_TRUE='#' - AMDEP_FALSE= +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" fi - +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu depcc="$CC" am_compiler_list= @@ -5180,6 +5339,298 @@ else fi + case $ac_cv_prog_cc_stdc in #( + no) : + ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;; #( + *) : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 +$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } +if ${ac_cv_prog_cc_c99+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +#include +#include +#include + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +#define debug(...) fprintf (stderr, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + your preprocessor is broken; +#endif +#if BIG_OK +#else + your preprocessor is broken; +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\0'; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static void +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str; + int number; + float fnumber; + + while (*format) + { + switch (*format++) + { + case 's': // string + str = va_arg (args_copy, const char *); + break; + case 'd': // int + number = va_arg (args_copy, int); + break; + case 'f': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); +} + +int +main () +{ + + // Check bool. + _Bool success = false; + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + test_varargs ("s, d' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' + || dynamic_array[ni.number - 1] != 543); + + ; + return 0; +} +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c99" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c99" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c99" != xno; then : + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 +else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if ${ac_cv_prog_cc_c89+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +struct stat; +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c89=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c89" != xno; then : + ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 +else + ac_cv_prog_cc_stdc=no +fi + +fi + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO Standard C" >&5 +$as_echo_n "checking for $CC option to accept ISO Standard C... " >&6; } + if ${ac_cv_prog_cc_stdc+:} false; then : + $as_echo_n "(cached) " >&6 +fi + + case $ac_cv_prog_cc_stdc in #( + no) : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; #( + '') : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; #( + *) : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_stdc" >&5 +$as_echo "$ac_cv_prog_cc_stdc" >&6; } ;; +esac + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. @@ -5823,131 +6274,6 @@ fi fi -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* - -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } @@ -6468,301 +6794,10 @@ $as_echo "#define _DARWIN_USE_64_BIT_INODE 1" >>confdefs.h fi - case $ac_cv_prog_cc_stdc in #( - no) : - ac_cv_prog_cc_c99=no; ac_cv_prog_cc_c89=no ;; #( - *) : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 -$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } -if ${ac_cv_prog_cc_c99+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c99=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include -#include - -// Check varargs macros. These examples are taken from C99 6.10.3.5. -#define debug(...) fprintf (stderr, __VA_ARGS__) -#define showlist(...) puts (#__VA_ARGS__) -#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) -static void -test_varargs_macros (void) -{ - int x = 1234; - int y = 5678; - debug ("Flag"); - debug ("X = %d\n", x); - showlist (The first, second, and third items.); - report (x>y, "x is %d but y is %d", x, y); -} - -// Check long long types. -#define BIG64 18446744073709551615ull -#define BIG32 4294967295ul -#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) -#if !BIG_OK - your preprocessor is broken; -#endif -#if BIG_OK -#else - your preprocessor is broken; -#endif -static long long int bignum = -9223372036854775807LL; -static unsigned long long int ubignum = BIG64; - -struct incomplete_array -{ - int datasize; - double data[]; -}; - -struct named_init { - int number; - const wchar_t *name; - double average; -}; - -typedef const char *ccp; - -static inline int -test_restrict (ccp restrict text) -{ - // See if C++-style comments work. - // Iterate through items via the restricted pointer. - // Also check for declarations in for loops. - for (unsigned int i = 0; *(text+i) != '\0'; ++i) - continue; - return 0; -} - -// Check varargs and va_copy. -static void -test_varargs (const char *format, ...) -{ - va_list args; - va_start (args, format); - va_list args_copy; - va_copy (args_copy, args); - - const char *str; - int number; - float fnumber; - - while (*format) - { - switch (*format++) - { - case 's': // string - str = va_arg (args_copy, const char *); - break; - case 'd': // int - number = va_arg (args_copy, int); - break; - case 'f': // float - fnumber = va_arg (args_copy, double); - break; - default: - break; - } - } - va_end (args_copy); - va_end (args); -} - -int -main () -{ - - // Check bool. - _Bool success = false; - - // Check restrict. - if (test_restrict ("String literal") == 0) - success = true; - char *restrict newvar = "Another string"; - - // Check varargs. - test_varargs ("s, d' f .", "string", 65, 34.234); - test_varargs_macros (); - - // Check flexible array members. - struct incomplete_array *ia = - malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); - ia->datasize = 10; - for (int i = 0; i < ia->datasize; ++i) - ia->data[i] = i * 1.234; - - // Check named initializers. - struct named_init ni = { - .number = 34, - .name = L"Test wide string", - .average = 543.34343, - }; - - ni.number = 58; - - int dynamic_array[ni.number]; - dynamic_array[ni.number - 1] = 543; - - // work around unused variable warnings - return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' - || dynamic_array[ni.number - 1] != 543); - - ; - return 0; -} -_ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c99=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c99" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c99" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c99" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 -$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c99" != xno; then : - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99 -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if ${ac_cv_prog_cc_c89+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_cv_prog_cc_c89=no -ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -struct stat; -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c89=$ac_arg -fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break -done -rm -f conftest.$ac_ext -CC=$ac_save_CC - -fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : - ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89 -else - ac_cv_prog_cc_stdc=no -fi - -fi - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO Standard C" >&5 -$as_echo_n "checking for $CC option to accept ISO Standard C... " >&6; } - if ${ac_cv_prog_cc_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -fi - - case $ac_cv_prog_cc_stdc in #( - no) : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; #( - '') : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; #( - *) : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_stdc" >&5 -$as_echo "$ac_cv_prog_cc_stdc" >&6; } ;; -esac - + # Code from module absolute-header: # Code from module acl: # Code from module alloca: # Code from module alloca-opt: @@ -6804,11 +6839,13 @@ esac # Code from module environ: # Code from module errno: # Code from module error: + # Code from module euidaccess: # Code from module exclude: # Code from module exitfail: # Code from module extensions: # Code from module extern-inline: + # Code from module faccessat: # Code from module fchdir: # Code from module fchmodat: # Code from module fchownat: @@ -6824,6 +6861,7 @@ esac # Code from module fnmatch: # Code from module fnmatch-gnu: # Code from module fpending: + # Code from module fprintftime: # Code from module fseek: # Code from module fseeko: @@ -6835,6 +6873,7 @@ esac # Code from module getcwd-lgpl: # Code from module getdelim: # Code from module getdtablesize: + # Code from module getgroups: # Code from module getline: # Code from module getopt-gnu: # Code from module getopt-posix: @@ -6844,6 +6883,7 @@ esac # Code from module gettime: # Code from module gettimeofday: # Code from module gitlog-to-changelog: + # Code from module group-member: # Code from module hash: # Code from module havelib: # Code from module human: @@ -6852,6 +6892,7 @@ esac # Code from module inttostr: # Code from module inttypes: # Code from module inttypes-incomplete: + # Code from module isatty: # Code from module iswblank: # Code from module langinfo: # Code from module largefile: @@ -6900,8 +6941,11 @@ esac # Code from module opendir: # Code from module parse-datetime: # Code from module pathmax: + # Code from module posix_openpt: # Code from module priv-set: # Code from module progname: + # Code from module ptsname: + # Code from module ptsname_r: # Code from module qacl: # Code from module quote: # Code from module quotearg: @@ -6960,12 +7004,15 @@ esac # Code from module streq: # Code from module strerror: # Code from module strerror-override: + # Code from module strftime: # Code from module string: # Code from module strings: # Code from module strndup: # Code from module strnlen: # Code from module strnlen1: + # Code from module strtoimax: # Code from module strtol: + # Code from module strtoll: # Code from module strtoul: # Code from module strtoull: # Code from module strtoumax: @@ -6979,6 +7026,7 @@ esac # Code from module time: # Code from module time_r: # Code from module timespec: + # Code from module ttyname_r: # Code from module unistd: # Code from module unistd-safer: # Code from module unitypes: @@ -6988,6 +7036,7 @@ esac # Code from module unlinkat: # Code from module unlinkdir: # Code from module unlocked-io: + # Code from module unlockpt: # Code from module unsetenv: # Code from module utimens: # Code from module utimensat: @@ -7013,6 +7062,106 @@ esac # Code from module xstrtoumax: # Code from module xvasprintf: +if test -n "$ac_tool_prefix"; then + for ac_prog in ar + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AR="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +AR=$ac_cv_prog_AR +if test -n "$AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5 +$as_echo "$AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$AR" && break + done +fi +if test -z "$AR"; then + ac_ct_AR=$AR + for ac_prog in ar +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_AR+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_AR"; then + ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AR="$ac_prog" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_AR=$ac_cv_prog_ac_ct_AR +if test -n "$ac_ct_AR"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_AR" && break +done + + if test "x$ac_ct_AR" = x; then + AR="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + AR=$ac_ct_AR + fi +fi + # Check whether --enable-largefile was given. if test "${enable_largefile+set}" = set; then : @@ -7216,62 +7365,6 @@ $as_echo "#define _DARWIN_USE_64_BIT_INODE 1" >>confdefs.h fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 -$as_echo_n "checking for library containing strerror... " >&6; } -if ${ac_cv_search_strerror+:} 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 strerror (); -int -main () -{ -return strerror (); - ; - return 0; -} -_ACEOF -for ac_lib in '' cposix; 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_strerror=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_strerror+:} false; then : - break -fi -done -if ${ac_cv_search_strerror+:} false; then : - -else - ac_cv_search_strerror=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5 -$as_echo "$ac_cv_search_strerror" >&6; } -ac_res=$ac_cv_search_strerror -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 $as_echo_n "checking for inline... " >&6; } if ${ac_cv_c_inline+:} false; then : @@ -7384,206 +7477,6 @@ fi done -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 -$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } -if ${ac_cv_header_sys_wait_h+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#ifndef WEXITSTATUS -# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) -#endif -#ifndef WIFEXITED -# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) -#endif - -int -main () -{ - int s; - wait (&s); - s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_sys_wait_h=yes -else - ac_cv_header_sys_wait_h=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5 -$as_echo "$ac_cv_header_sys_wait_h" >&6; } -if test $ac_cv_header_sys_wait_h = yes; then - -$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h - -fi - - -ac_header_dirent=no -for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do - as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5 -$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; } -if eval \${$as_ac_Header+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include <$ac_hdr> - -int -main () -{ -if ((DIR *) 0) -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$as_ac_Header=yes" -else - eval "$as_ac_Header=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$as_ac_Header - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 -_ACEOF - -ac_header_dirent=$ac_hdr; break -fi - -done -# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. -if test $ac_header_dirent = dirent.h; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 -$as_echo_n "checking for library containing opendir... " >&6; } -if ${ac_cv_search_opendir+:} 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 opendir (); -int -main () -{ -return opendir (); - ; - return 0; -} -_ACEOF -for ac_lib in '' dir; 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_opendir=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_opendir+:} false; then : - break -fi -done -if ${ac_cv_search_opendir+:} false; then : - -else - ac_cv_search_opendir=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 -$as_echo "$ac_cv_search_opendir" >&6; } -ac_res=$ac_cv_search_opendir -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -fi - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5 -$as_echo_n "checking for library containing opendir... " >&6; } -if ${ac_cv_search_opendir+:} 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 opendir (); -int -main () -{ -return opendir (); - ; - return 0; -} -_ACEOF -for ac_lib in '' x; 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_opendir=$ac_res -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext - if ${ac_cv_search_opendir+:} false; then : - break -fi -done -if ${ac_cv_search_opendir+:} false; then : - -else - ac_cv_search_opendir=no -fi -rm conftest.$ac_ext -LIBS=$ac_func_search_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5 -$as_echo "$ac_cv_search_opendir" >&6; } -ac_res=$ac_cv_search_opendir -if test "$ac_res" != no; then : - test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - -fi - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/types.h defines makedev" >&5 $as_echo_n "checking whether sys/types.h defines makedev... " >&6; } if ${ac_cv_header_sys_types_h_makedev+:} false; then : @@ -7634,160 +7527,6 @@ fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5 -$as_echo_n "checking whether stat file-mode macros are broken... " >&6; } -if ${ac_cv_header_stat_broken+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include - -#if defined S_ISBLK && defined S_IFDIR -extern char c1[S_ISBLK (S_IFDIR) ? -1 : 1]; -#endif - -#if defined S_ISBLK && defined S_IFCHR -extern char c2[S_ISBLK (S_IFCHR) ? -1 : 1]; -#endif - -#if defined S_ISLNK && defined S_IFREG -extern char c3[S_ISLNK (S_IFREG) ? -1 : 1]; -#endif - -#if defined S_ISSOCK && defined S_IFREG -extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1]; -#endif - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stat_broken=no -else - ac_cv_header_stat_broken=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5 -$as_echo "$ac_cv_header_stat_broken" >&6; } -if test $ac_cv_header_stat_broken = yes; then - -$as_echo "#define STAT_MACROS_BROKEN 1" >>confdefs.h - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if ${ac_cv_header_stdc+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes -else - ac_cv_header_stdc=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : - : -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - return 2; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - -else - ac_cv_header_stdc=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - -fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } -if test $ac_cv_header_stdc = yes; then - -$as_echo "#define STDC_HEADERS 1" >>confdefs.h - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for st_fstype string in struct stat" >&5 $as_echo_n "checking for st_fstype string in struct stat... " >&6; } @@ -7828,7 +7567,9 @@ fi # Check whether --with-posix-acls was given. if test "${with_posix_acls+set}" = set; then : - withval=$with_posix_acls; with_posix_acls=no + withval=$with_posix_acls; +else + with_posix_acls=yes fi if test "x$with_posix_acls" != "xno"; then @@ -7847,7 +7588,8 @@ fi done for tar_acl_func in acl_get_file acl_get_fd acl_set_file acl_set_fd \ - acl_to_text acl_from_text; do \ + acl_to_text acl_from_text acl_delete_def_file \ + acl_free; do \ test "x$with_posix_acls" = xno && break as_ac_Search=`$as_echo "ac_cv_search_$tar_acl_func" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing $tar_acl_func" >&5 @@ -7920,39 +7662,6 @@ else export enable_acl=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 -$as_echo_n "checking return type of signal handlers... " >&6; } -if ${ac_cv_type_signal+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -#include - -int -main () -{ -return *(signal (0, 0)) (0) == 1; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_type_signal=int -else - ac_cv_type_signal=void -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 -$as_echo "$ac_cv_type_signal" >&6; } - -cat >>confdefs.h <<_ACEOF -#define RETSIGTYPE $ac_cv_type_signal -_ACEOF - - ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" if test "x$ac_cv_type_mode_t" = xyes; then : @@ -7986,17 +7695,6 @@ _ACEOF fi -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 : - -else - -cat >>confdefs.h <<_ACEOF -#define size_t unsigned int -_ACEOF - -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5 $as_echo_n "checking for uid_t in sys/types.h... " >&6; } if ${ac_cv_type_uid_t+:} false; then : @@ -8111,6 +7809,17 @@ $as_echo "#define ssize_t int" >>confdefs.h LIBC_FATAL_STDERR_=1 export LIBC_FATAL_STDERR_ +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 : + +else + +cat >>confdefs.h <<_ACEOF +#define size_t unsigned int +_ACEOF + +fi + # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5 @@ -8618,7 +8327,7 @@ DIR *dp = opendir ("."); e = readdir (dp); if (! e) return 2; - if (stat (e->d_name, &st) != 0) + if (lstat (e->d_name, &st) != 0) return 3; if (e->d_ino != st.st_ino) return 4; @@ -9456,6 +9165,7 @@ $as_echo "#define FUNC_REALPATH_WORKS 1" >>confdefs.h REPLACE_FTRUNCATE=0; REPLACE_GETCWD=0; REPLACE_GETDOMAINNAME=0; + REPLACE_GETDTABLESIZE=0; REPLACE_GETLOGIN_R=0; REPLACE_GETGROUPS=0; REPLACE_GETPAGESIZE=0; @@ -10069,36 +9779,40 @@ if ${gl_cv_next_errno_h+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'errno.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_errno_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` - gl_header_literal_regex=`echo 'errno.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_errno_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_header=$gl_cv_absolute_errno_h + gl_cv_next_errno_h='"'$gl_header'"' fi @@ -10438,6 +10152,75 @@ fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking type of array argument to getgroups" >&5 +$as_echo_n "checking type of array argument to getgroups... " >&6; } +if ${ac_cv_type_getgroups+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + ac_cv_type_getgroups=cross +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Thanks to Mike Rendell for this test. */ +$ac_includes_default +#define NGID 256 +#undef MAX +#define MAX(x, y) ((x) > (y) ? (x) : (y)) + +int +main () +{ + gid_t gidset[NGID]; + int i, n; + union { gid_t gval; long int lval; } val; + + val.lval = -1; + for (i = 0; i < NGID; i++) + gidset[i] = val.gval; + n = getgroups (sizeof (gidset) / MAX (sizeof (int), sizeof (gid_t)) - 1, + gidset); + /* Exit non-zero if getgroups seems to require an array of ints. This + happens when gid_t is short int but getgroups modifies an array + of ints. */ + return n > 0 && gidset[n] != val.gval; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_type_getgroups=gid_t +else + ac_cv_type_getgroups=int +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +if test $ac_cv_type_getgroups = cross; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "getgroups.*int.*gid_t" >/dev/null 2>&1; then : + ac_cv_type_getgroups=gid_t +else + ac_cv_type_getgroups=int +fi +rm -f conftest* + +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_getgroups" >&5 +$as_echo "$ac_cv_type_getgroups" >&6; } + +cat >>confdefs.h <<_ACEOF +#define GETGROUPS_T $ac_cv_type_getgroups +_ACEOF + + + + ac_fn_c_check_decl "$LINENO" "fchdir" "ac_cv_have_decl_fchdir" "$ac_includes_default" if test "x$ac_cv_have_decl_fchdir" = xyes; then : @@ -10714,8 +10497,6 @@ $as_echo "#define mbstate_t int" >>confdefs.h - - GNULIB_DPRINTF=0; GNULIB_FCLOSE=0; GNULIB_FDOPEN=0; @@ -10926,36 +10707,40 @@ if ${gl_cv_next_sys_types_h+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'sys/types.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_sys_types_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` - gl_header_literal_regex=`echo 'sys/types.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_sys_types_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_header=$gl_cv_absolute_sys_types_h + gl_cv_next_sys_types_h='"'$gl_header'"' fi @@ -11049,6 +10834,48 @@ $as_echo "$gl_cv_func_fseeko" >&6; } fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5 +$as_echo_n "checking whether stat file-mode macros are broken... " >&6; } +if ${ac_cv_header_stat_broken+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include + +#if defined S_ISBLK && defined S_IFDIR +extern char c1[S_ISBLK (S_IFDIR) ? -1 : 1]; +#endif + +#if defined S_ISBLK && defined S_IFCHR +extern char c2[S_ISBLK (S_IFCHR) ? -1 : 1]; +#endif + +#if defined S_ISLNK && defined S_IFREG +extern char c3[S_ISLNK (S_IFREG) ? -1 : 1]; +#endif + +#if defined S_ISSOCK && defined S_IFREG +extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1]; +#endif + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_header_stat_broken=no +else + ac_cv_header_stat_broken=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5 +$as_echo "$ac_cv_header_stat_broken" >&6; } +if test $ac_cv_header_stat_broken = yes; then + +$as_echo "#define STAT_MACROS_BROKEN 1" >>confdefs.h + +fi + @@ -11077,36 +10904,40 @@ else if test $ac_cv_header_sys_stat_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - - gl_header_literal_regex=`echo 'sys/stat.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_sys_stat_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'sys/stat.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_sys_stat_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_sys_stat_h + gl_cv_next_sys_stat_h='"'$gl_header'"' else gl_cv_next_sys_stat_h='<'sys/stat.h'>' fi @@ -11431,36 +11262,40 @@ else if test $ac_cv_header_getopt_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - - gl_header_literal_regex=`echo 'getopt.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_getopt_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'getopt.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_getopt_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_getopt_h + gl_cv_next_getopt_h='"'$gl_header'"' else gl_cv_next_getopt_h='<'getopt.h'>' fi @@ -12069,36 +11904,40 @@ else if test $ac_cv_header_sys_time_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - - gl_header_literal_regex=`echo 'sys/time.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_sys_time_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'sys/time.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_sys_time_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_sys_time_h + gl_cv_next_sys_time_h='"'$gl_header'"' else gl_cv_next_sys_time_h='<'sys/time.h'>' fi @@ -12503,36 +12342,40 @@ else if test $ac_cv_header_stdint_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - - gl_header_literal_regex=`echo 'stdint.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_stdint_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'stdint.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_stdint_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_stdint_h + gl_cv_next_stdint_h='"'$gl_header'"' else gl_cv_next_stdint_h='<'stdint.h'>' fi @@ -13180,6 +13023,7 @@ fi HAVE_DECL_STRTOIMAX=1; HAVE_DECL_STRTOUMAX=1; REPLACE_STRTOIMAX=0; + REPLACE_STRTOUMAX=0; INT32_MAX_LT_INTMAX_MAX=1; INT64_MAX_EQ_LONG_MAX='defined _LP64'; PRI_MACROS_BROKEN=0; @@ -13213,36 +13057,40 @@ else if test $ac_cv_header_inttypes_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - - gl_header_literal_regex=`echo 'inttypes.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_inttypes_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'inttypes.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_inttypes_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_inttypes_h + gl_cv_next_inttypes_h='"'$gl_header'"' else gl_cv_next_inttypes_h='<'inttypes.h'>' fi @@ -13464,36 +13312,40 @@ else if test $ac_cv_header_wctype_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - - gl_header_literal_regex=`echo 'wctype.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_wctype_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'wctype.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_wctype_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_wctype_h + gl_cv_next_wctype_h='"'$gl_header'"' else gl_cv_next_wctype_h='<'wctype.h'>' fi @@ -13963,36 +13815,40 @@ if ${gl_cv_next_stddef_h+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'stddef.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_stddef_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` - gl_header_literal_regex=`echo 'stddef.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_stddef_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_header=$gl_cv_absolute_stddef_h + gl_cv_next_stddef_h='"'$gl_header'"' fi @@ -14799,6 +14655,10 @@ _ACEOF REPLACE_NANOSLEEP=GNULIB_PORTCHECK; REPLACE_TIMEGM=GNULIB_PORTCHECK; + : ${GNULIB_GETTIMEOFDAY=0}; + REPLACE_GMTIME=0; + REPLACE_LOCALTIME=0; + ac_fn_c_check_decl "$LINENO" "alarm" "ac_cv_have_decl_alarm" "$ac_includes_default" if test "x$ac_cv_have_decl_alarm" = xyes; then : ac_have_decl=1 @@ -15046,6 +14906,12 @@ fi + + + + + + GNULIB_PTHREAD_SIGMASK=0; GNULIB_RAISE=0; GNULIB_SIGNAL_H_SIGPIPE=0; @@ -15149,12 +15015,14 @@ fi # Warn if SELinux is found but libselinux is absent; - if test "$ac_cv_search_setfilecon" = no && - test "$host" = "$build" && test -d /selinux; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This system supports SELinux but libselinux is missing." >&5 + if test "$ac_cv_search_setfilecon" = no; then + if test "$host" = "$build" && test -d /selinux; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This system supports SELinux but libselinux is missing." >&5 $as_echo "$as_me: WARNING: This system supports SELinux but libselinux is missing." >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GNU tar will be compiled without SELinux support." >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: GNU tar will be compiled without SELinux support." >&5 $as_echo "$as_me: WARNING: GNU tar will be compiled without SELinux support." >&2;} + fi + with_selinux=no fi @@ -15425,6 +15293,8 @@ $as_echo "#define REPLACE_STRERROR_0 1" >>confdefs.h + + if test $gl_cv_have_include_next = yes; then gl_cv_next_string_h='<'string.h'>' else @@ -15434,36 +15304,40 @@ if ${gl_cv_next_string_h+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'string.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_string_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` - gl_header_literal_regex=`echo 'string.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_string_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_header=$gl_cv_absolute_string_h + gl_cv_next_string_h='"'$gl_header'"' fi @@ -15552,36 +15426,40 @@ else if test $ac_cv_header_strings_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + 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 + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - - gl_header_literal_regex=`echo 'strings.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_strings_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'strings.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_strings_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_strings_h + gl_cv_next_strings_h='"'$gl_header'"' else gl_cv_next_strings_h='<'strings.h'>' fi @@ -15683,6 +15561,19 @@ _ACEOF +ac_fn_c_check_decl "$LINENO" "strtoimax" "ac_cv_have_decl_strtoimax" "$ac_includes_default" +if test "x$ac_cv_have_decl_strtoimax" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRTOIMAX $ac_have_decl +_ACEOF + + + ac_fn_c_check_decl "$LINENO" "strtoumax" "ac_cv_have_decl_strtoumax" "$ac_includes_default" if test "x$ac_cv_have_decl_strtoumax" = xyes; then : ac_have_decl=1 @@ -15817,36 +15708,40 @@ if ${gl_cv_next_time_h+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'time.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_time_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` - gl_header_literal_regex=`echo 'time.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_time_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_header=$gl_cv_absolute_time_h + gl_cv_next_time_h='"'$gl_header'"' fi @@ -15871,6 +15766,17 @@ $as_echo "$gl_cv_next_time_h" >&6; } +ac_fn_c_check_decl "$LINENO" "ttyname_r" "ac_cv_have_decl_ttyname_r" "$ac_includes_default" +if test "x$ac_cv_have_decl_ttyname_r" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_TTYNAME_R $ac_have_decl +_ACEOF + @@ -17477,6 +17383,10 @@ $as_echo "#define GNULIB_TEST_CLOSEDIR 1" >>confdefs.h if test "x$localedir" = x; then localedir='${datarootdir}/locale' + fi + if test "x$runstatedir" = x; then + runstatedir='${localstatedir}/run' + fi pkglibexecdir='${libexecdir}/${PACKAGE}' @@ -17513,7 +17423,7 @@ DIR *dp = opendir ("."); e = readdir (dp); if (! e) return 2; - if (stat (e->d_name, &st) != 0) + if (lstat (e->d_name, &st) != 0) return 3; if (e->d_ino != st.st_ino) return 4; @@ -17568,36 +17478,40 @@ else if test $ac_cv_header_dirent_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - - gl_header_literal_regex=`echo 'dirent.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_dirent_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'dirent.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_dirent_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_dirent_h + gl_cv_next_dirent_h='"'$gl_header'"' else gl_cv_next_dirent_h='<'dirent.h'>' fi @@ -17978,9 +17892,11 @@ int result = 0; /* Many gnulib modules require POSIX conformance of EBADF. */ if (dup2 (2, 1000000) == -1 && errno != EBADF) result |= 16; - /* Flush out a cygwin core dump. */ + /* Flush out some cygwin core dumps. */ if (dup2 (2, -1) != -1 || errno != EBADF) result |= 32; + dup2 (2, 255); + dup2 (2, 256); return result; ; @@ -18005,6 +17921,17 @@ $as_echo "$gl_cv_func_dup2_works" >&6; } *yes) ;; *) REPLACE_DUP2=1 + for ac_func in setdtablesize +do : + ac_fn_c_check_func "$LINENO" "setdtablesize" "ac_cv_func_setdtablesize" +if test "x$ac_cv_func_setdtablesize" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SETDTABLESIZE 1 +_ACEOF + +fi +done + ;; esac fi @@ -18125,6 +18052,310 @@ $as_echo "$ac_cv_lib_error_at_line" >&6; } + for ac_func in euidaccess +do : + ac_fn_c_check_func "$LINENO" "euidaccess" "ac_cv_func_euidaccess" +if test "x$ac_cv_func_euidaccess" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_EUIDACCESS 1 +_ACEOF + +fi +done + + if test $ac_cv_func_euidaccess = no; then + HAVE_EUIDACCESS=0 + fi + + if test $HAVE_EUIDACCESS = 0; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS euidaccess.$ac_objext" + + + + for ac_header in libgen.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "libgen.h" "ac_cv_header_libgen_h" "$ac_includes_default" +if test "x$ac_cv_header_libgen_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBGEN_H 1 +_ACEOF + +fi + +done + + + ac_fn_c_check_func "$LINENO" "getgroups" "ac_cv_func_getgroups" +if test "x$ac_cv_func_getgroups" = xyes; then : + +fi + + + # If we don't yet have getgroups, see if it's in -lbsd. + # This is reported to be necessary on an ITOS 3000WS running SEIUX 3.1. + ac_save_LIBS=$LIBS + if test $ac_cv_func_getgroups = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getgroups in -lbsd" >&5 +$as_echo_n "checking for getgroups in -lbsd... " >&6; } +if ${ac_cv_lib_bsd_getgroups+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbsd $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char getgroups (); +int +main () +{ +return getgroups (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_bsd_getgroups=yes +else + ac_cv_lib_bsd_getgroups=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_getgroups" >&5 +$as_echo "$ac_cv_lib_bsd_getgroups" >&6; } +if test "x$ac_cv_lib_bsd_getgroups" = xyes; then : + GETGROUPS_LIB=-lbsd +fi + + fi + + # Run the program to test the functionality of the system-supplied + # getgroups function only if there is such a function. + if test $ac_cv_func_getgroups = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working getgroups" >&5 +$as_echo_n "checking for working getgroups... " >&6; } +if ${ac_cv_func_getgroups_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + case "$host_os" in # (( + # Guess yes on glibc systems. + *-gnu*) ac_cv_func_getgroups_works="guessing yes" ;; + # If we don't know, assume the worst. + *) ac_cv_func_getgroups_works="guessing no" ;; + esac + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +/* On Ultrix 4.3, getgroups (0, 0) always fails. */ + return getgroups (0, 0) == -1; + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_getgroups_works=yes +else + ac_cv_func_getgroups_works=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getgroups_works" >&5 +$as_echo "$ac_cv_func_getgroups_works" >&6; } + else + ac_cv_func_getgroups_works=no + fi + case "$ac_cv_func_getgroups_works" in + *yes) + +$as_echo "#define HAVE_GETGROUPS 1" >>confdefs.h + + ;; + esac + LIBS=$ac_save_LIBS + + + # Solaris 9 and 10 need -lgen to get the eaccess function. + # Save and restore LIBS so -lgen isn't added to it. Otherwise, *all* + # programs in the package would end up linked with that potentially-shared + # library, inducing unnecessary run-time overhead. + LIB_EACCESS= + + gl_saved_libs=$LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing eaccess" >&5 +$as_echo_n "checking for library containing eaccess... " >&6; } +if ${ac_cv_search_eaccess+:} 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 eaccess (); +int +main () +{ +return eaccess (); + ; + return 0; +} +_ACEOF +for ac_lib in '' gen; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_eaccess=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_eaccess+:} false; then : + break +fi +done +if ${ac_cv_search_eaccess+:} false; then : + +else + ac_cv_search_eaccess=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_eaccess" >&5 +$as_echo "$ac_cv_search_eaccess" >&6; } +ac_res=$ac_cv_search_eaccess +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + test "$ac_cv_search_eaccess" = "none required" || + LIB_EACCESS=$ac_cv_search_eaccess +fi + + for ac_func in eaccess +do : + ac_fn_c_check_func "$LINENO" "eaccess" "ac_cv_func_eaccess" +if test "x$ac_cv_func_eaccess" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_EACCESS 1 +_ACEOF + +fi +done + + LIBS=$gl_saved_libs + + fi + + + + + + GNULIB_EUIDACCESS=1 + + + + + +$as_echo "#define GNULIB_TEST_EUIDACCESS 1" >>confdefs.h + + + + + + + + + + + if test $ac_cv_func_faccessat = no; then + HAVE_FACCESSAT=0 + fi + + if test $HAVE_FACCESSAT = 0; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS faccessat.$ac_objext" + + + for ac_func in access +do : + ac_fn_c_check_func "$LINENO" "access" "ac_cv_func_access" +if test "x$ac_cv_func_access" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ACCESS 1 +_ACEOF + +fi +done + + + fi + + +cat >>confdefs.h <<_ACEOF +#define GNULIB_FACCESSAT 1 +_ACEOF + + + + + + + + GNULIB_FACCESSAT=1 + + + + + +$as_echo "#define GNULIB_TEST_FACCESSAT 1" >>confdefs.h + + + + + + + if test $ac_cv_have_decl_fchdir = no; then HAVE_DECL_FCHDIR=0 @@ -18615,36 +18846,40 @@ if ${gl_cv_next_fcntl_h+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'fcntl.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_fcntl_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` - gl_header_literal_regex=`echo 'fcntl.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_fcntl_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_header=$gl_cv_absolute_fcntl_h + gl_cv_next_fcntl_h='"'$gl_header'"' fi @@ -19009,36 +19244,40 @@ if ${gl_cv_next_float_h+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'float.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_float_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` - gl_header_literal_regex=`echo 'float.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_float_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_header=$gl_cv_absolute_float_h + gl_cv_next_float_h='"'$gl_header'"' fi @@ -19311,14 +19550,42 @@ _ACEOF fi - fp_headers=' -# include -# if HAVE_STDIO_EXT_H -# include -# endif -' - ac_fn_c_check_decl "$LINENO" "__fpending" "ac_cv_have_decl___fpending" "$fp_headers + #include + #if HAVE_STDIO_EXT_H + # include + #endif + ' + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __fpending" >&5 +$as_echo_n "checking for __fpending... " >&6; } +if ${gl_cv_func___fpending+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$fp_headers +int +main () +{ +return ! __fpending (stdin); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gl_cv_func___fpending=yes +else + gl_cv_func___fpending=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func___fpending" >&5 +$as_echo "$gl_cv_func___fpending" >&6; } + if test $gl_cv_func___fpending = yes; then + ac_fn_c_check_decl "$LINENO" "__fpending" "ac_cv_have_decl___fpending" "$fp_headers " if test "x$ac_cv_have_decl___fpending" = xyes; then : ac_have_decl=1 @@ -19330,8 +19597,9 @@ cat >>confdefs.h <<_ACEOF #define HAVE_DECL___FPENDING $ac_have_decl _ACEOF + fi - if test $ac_cv_func___fpending = no; then + if test $gl_cv_func___fpending = no; then @@ -20078,6 +20346,7 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include #include #if HAVE_UNISTD_H # include @@ -20469,11 +20738,62 @@ $as_echo "#define GNULIB_TEST_GETDELIM 1" >>confdefs.h - if test $ac_cv_func_getdtablesize != yes; then + + if test $ac_cv_func_getdtablesize = yes; then + # Cygwin 1.7.25 automatically increases the RLIMIT_NOFILE soft limit + # up to an unchangeable hard limit; all other platforms correctly + # require setrlimit before getdtablesize() can report a larger value. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getdtablesize works" >&5 +$as_echo_n "checking whether getdtablesize works... " >&6; } +if ${gl_cv_func_getdtablesize_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + case "$host_os" in + cygwin*) # on cygwin 1.5.25, getdtablesize() automatically grows + gl_cv_func_getdtablesize_works="guessing no" ;; + *) gl_cv_func_getdtablesize_works="guessing yes" ;; + esac +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include +int +main () +{ +int size = getdtablesize(); + if (dup2 (0, getdtablesize()) != -1) + return 1; + if (size != getdtablesize()) + return 2; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_getdtablesize_works=yes +else + gl_cv_func_getdtablesize_works=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getdtablesize_works" >&5 +$as_echo "$gl_cv_func_getdtablesize_works" >&6; } + case "$gl_cv_func_getdtablesize_works" in + *yes) ;; + *) REPLACE_GETDTABLESIZE=1 ;; + esac + else HAVE_GETDTABLESIZE=0 fi - if test $HAVE_GETDTABLESIZE = 0; then + if test $HAVE_GETDTABLESIZE = 0 || test $REPLACE_GETDTABLESIZE = 1; then @@ -20506,6 +20826,206 @@ $as_echo "#define GNULIB_TEST_GETDTABLESIZE 1" >>confdefs.h + ac_fn_c_check_func "$LINENO" "getgroups" "ac_cv_func_getgroups" +if test "x$ac_cv_func_getgroups" = xyes; then : + +fi + + + # If we don't yet have getgroups, see if it's in -lbsd. + # This is reported to be necessary on an ITOS 3000WS running SEIUX 3.1. + ac_save_LIBS=$LIBS + if test $ac_cv_func_getgroups = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getgroups in -lbsd" >&5 +$as_echo_n "checking for getgroups in -lbsd... " >&6; } +if ${ac_cv_lib_bsd_getgroups+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbsd $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char getgroups (); +int +main () +{ +return getgroups (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_bsd_getgroups=yes +else + ac_cv_lib_bsd_getgroups=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_getgroups" >&5 +$as_echo "$ac_cv_lib_bsd_getgroups" >&6; } +if test "x$ac_cv_lib_bsd_getgroups" = xyes; then : + GETGROUPS_LIB=-lbsd +fi + + fi + + # Run the program to test the functionality of the system-supplied + # getgroups function only if there is such a function. + if test $ac_cv_func_getgroups = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working getgroups" >&5 +$as_echo_n "checking for working getgroups... " >&6; } +if ${ac_cv_func_getgroups_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + case "$host_os" in # (( + # Guess yes on glibc systems. + *-gnu*) ac_cv_func_getgroups_works="guessing yes" ;; + # If we don't know, assume the worst. + *) ac_cv_func_getgroups_works="guessing no" ;; + esac + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +/* On Ultrix 4.3, getgroups (0, 0) always fails. */ + return getgroups (0, 0) == -1; + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_getgroups_works=yes +else + ac_cv_func_getgroups_works=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getgroups_works" >&5 +$as_echo "$ac_cv_func_getgroups_works" >&6; } + else + ac_cv_func_getgroups_works=no + fi + case "$ac_cv_func_getgroups_works" in + *yes) + +$as_echo "#define HAVE_GETGROUPS 1" >>confdefs.h + + ;; + esac + LIBS=$ac_save_LIBS + + if test $ac_cv_func_getgroups != yes; then + HAVE_GETGROUPS=0 + else + if test "$ac_cv_type_getgroups" != gid_t \ + || { case "$ac_cv_func_getgroups_works" in + *yes) false;; + *) true;; + esac + }; then + REPLACE_GETGROUPS=1 + +$as_echo "#define GETGROUPS_ZERO_BUG 1" >>confdefs.h + + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getgroups handles negative values" >&5 +$as_echo_n "checking whether getgroups handles negative values... " >&6; } +if ${gl_cv_func_getgroups_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + case "$host_os" in + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_getgroups_works="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_getgroups_works="guessing no" ;; + esac + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +int size = getgroups (0, 0); + gid_t *list = malloc (size * sizeof *list); + return getgroups (-1, list) != -1; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_getgroups_works=yes +else + gl_cv_func_getgroups_works=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_getgroups_works" >&5 +$as_echo "$gl_cv_func_getgroups_works" >&6; } + case "$gl_cv_func_getgroups_works" in + *yes) ;; + *) REPLACE_GETGROUPS=1 ;; + esac + fi + fi + test -n "$GETGROUPS_LIB" && LIBS="$GETGROUPS_LIB $LIBS" + + if test $HAVE_GETGROUPS = 0 || test $REPLACE_GETGROUPS = 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS getgroups.$ac_objext" + + fi + + + + + + GNULIB_GETGROUPS=1 + + + + + +$as_echo "#define GNULIB_TEST_GETGROUPS 1" >>confdefs.h + + + + + + + + gl_getline_needs_run_time_check=no @@ -20876,12 +21396,8 @@ $as_echo "$gl_cv_func_gettimeofday_clobber" >&6; } *yes) REPLACE_GETTIMEOFDAY=1 - -$as_echo "#define gmtime rpl_gmtime" >>confdefs.h - - -$as_echo "#define localtime rpl_localtime" >>confdefs.h - + REPLACE_GMTIME=1 + REPLACE_LOCALTIME=1 $as_echo "#define GETTIMEOFDAY_CLOBBERS_LOCALTIME 1" >>confdefs.h @@ -21013,6 +21529,51 @@ $as_echo "#define GNULIB_TEST_GETTIMEOFDAY 1" >>confdefs.h + + + + + ac_fn_c_check_func "$LINENO" "group_member" "ac_cv_func_group_member" +if test "x$ac_cv_func_group_member" = xyes; then : + +else + + HAVE_GROUP_MEMBER=0 + +fi + + + if test $HAVE_GROUP_MEMBER = 0; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS group-member.$ac_objext" + + + + + fi + + + + + + GNULIB_GROUP_MEMBER=1 + + + + + +$as_echo "#define GNULIB_TEST_GROUP_MEMBER 1" >>confdefs.h + + + + : @@ -21280,6 +21841,40 @@ $as_echo "$gl_cv_test_UINT64_MAX_EQ_ULONG_MAX" >&6; } + case $host_os in + mingw*) REPLACE_ISATTY=1 ;; + esac + + if test $REPLACE_ISATTY = 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS isatty.$ac_objext" + + : + fi + + + + + + GNULIB_ISATTY=1 + + + + + +$as_echo "#define GNULIB_TEST_ISATTY 1" >>confdefs.h + + + + + @@ -21377,36 +21972,40 @@ else if test $ac_cv_header_langinfo_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - - gl_header_literal_regex=`echo 'langinfo.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_langinfo_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'langinfo.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_langinfo_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_langinfo_h + gl_cv_next_langinfo_h='"'$gl_header'"' else gl_cv_next_langinfo_h='<'langinfo.h'>' fi @@ -22197,36 +22796,40 @@ if ${gl_cv_next_locale_h+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'locale.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' - gl_header_literal_regex=`echo 'locale.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_locale_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_cv_absolute_locale_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_locale_h + gl_cv_next_locale_h='"'$gl_header'"' fi @@ -25265,6 +25868,43 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + + + + + if test $ac_cv_func_posix_openpt != yes; then + HAVE_POSIX_OPENPT=0 + fi + + if test $HAVE_POSIX_OPENPT = 0; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS posix_openpt.$ac_objext" + + fi + + + + + + GNULIB_POSIX_OPENPT=1 + + + + + +$as_echo "#define GNULIB_TEST_POSIX_OPENPT 1" >>confdefs.h + + + + for ac_func in getppriv do : ac_fn_c_check_func "$LINENO" "getppriv" "ac_cv_func_getppriv" @@ -25303,6 +25943,237 @@ cat >>confdefs.h <<_ACEOF _ACEOF + + + + + for ac_func in ptsname +do : + ac_fn_c_check_func "$LINENO" "ptsname" "ac_cv_func_ptsname" +if test "x$ac_cv_func_ptsname" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_PTSNAME 1 +_ACEOF + +fi +done + + if test $ac_cv_func_ptsname = no; then + HAVE_PTSNAME=0 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ptsname sets errno on failure" >&5 +$as_echo_n "checking whether ptsname sets errno on failure... " >&6; } +if ${gl_cv_func_ptsname_sets_errno+:} 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_ptsname_sets_errno="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_ptsname_sets_errno="guessing no" ;; + esac + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +int +main () +{ + + return ptsname (-1) || !errno; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_ptsname_sets_errno=yes +else + gl_cv_func_ptsname_sets_errno=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ptsname_sets_errno" >&5 +$as_echo "$gl_cv_func_ptsname_sets_errno" >&6; } + case $gl_cv_func_ptsname_sets_errno in + *no) REPLACE_PTSNAME=1 ;; + esac + fi + + if test $HAVE_PTSNAME = 0 || test $REPLACE_PTSNAME = 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS ptsname.$ac_objext" + + + : + + fi + + + + + + GNULIB_PTSNAME=1 + + + + + +$as_echo "#define GNULIB_TEST_PTSNAME 1" >>confdefs.h + + + + + + + + + + if test $ac_cv_func_ptsname_r = no; then + HAVE_PTSNAME_R=0 + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ptsname_r has the same signature as in glibc" >&5 +$as_echo_n "checking whether ptsname_r has the same signature as in glibc... " >&6; } +if ${gl_cv_func_ptsname_r_signature_ok+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + /* Test whether ptsname_r is declared at all. */ + int (*f) (int, char *, size_t) = ptsname_r; + /* Test whether it has the same declaration as in glibc. */ + #undef ptsname_r + extern + #ifdef __cplusplus + "C" + #endif + int ptsname_r (int, char *, size_t); + +int +main () +{ +return f (0, NULL, 0); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_func_ptsname_r_signature_ok=yes +else + gl_cv_func_ptsname_r_signature_ok=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ptsname_r_signature_ok" >&5 +$as_echo "$gl_cv_func_ptsname_r_signature_ok" >&6; } + if test $gl_cv_func_ptsname_r_signature_ok = no; then + REPLACE_PTSNAME_R=1 + fi + fi + + if test $HAVE_PTSNAME_R = 0 || test $REPLACE_PTSNAME_R = 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS ptsname_r.$ac_objext" + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether isatty sets errno when it fails" >&5 +$as_echo_n "checking whether isatty sets errno when it fails... " >&6; } +if ${gl_cv_func_isatty_sets_errno+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + case "$host_os" in + irix* | solaris* | mingw*) + gl_cv_func_isatty_sets_errno="guessing no";; + *) + gl_cv_func_isatty_sets_errno="guessing yes";; + esac + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ + # include + #else + # include + #endif + +int +main () +{ +errno = 0; + isatty (-1); + return errno == 0; + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_isatty_sets_errno=yes +else + gl_cv_func_isatty_sets_errno=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_isatty_sets_errno" >&5 +$as_echo "$gl_cv_func_isatty_sets_errno" >&6; } + case "$gl_cv_func_isatty_sets_errno" in + *yes) ;; + *) + +$as_echo "#define ISATTY_FAILS_WITHOUT_SETTING_ERRNO 1" >>confdefs.h + + ;; + esac + + fi + + + + + + GNULIB_PTSNAME_R=1 + + + + + +$as_echo "#define GNULIB_TEST_PTSNAME_R 1" >>confdefs.h + + + + # Check whether --enable-acl was given. if test "${enable_acl+set}" = set; then : enableval=$enable_acl; @@ -25311,6 +26182,7 @@ else fi + LIB_ACL= use_acl=0 if test "x$enable_acl" != "xno"; then @@ -25410,10 +26282,8 @@ $as_echo_n "checking for working acl_get_file... " >&6; } if ${gl_cv_func_working_acl_get_file+:} false; then : $as_echo_n "(cached) " >&6 else - if test "$cross_compiling" = yes; then : - gl_cv_func_working_acl_get_file=cross-compiling -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + gl_cv_func_working_acl_get_file=no + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -25430,20 +26300,19 @@ if (!acl_get_file (".", ACL_TYPE_ACCESS) && errno == ENOENT) return 0; } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - gl_cv_func_working_acl_get_file=yes -else - gl_cv_func_working_acl_get_file=no -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext +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 = yes; then : + if test "$gl_cv_func_working_acl_get_file" != no; then : use_acl=1 fi @@ -26141,6 +27010,7 @@ fi # If cross compiling, assume the test would fail and use the included # regex.c. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working re_compile_pattern" >&5 $as_echo_n "checking for working re_compile_pattern... " >&6; } if ${gl_cv_func_re_compile_pattern_working+:} false; then : @@ -26156,9 +27026,19 @@ else #include #include #include - #if HAVE_DECL_ALARM - # include + + #if defined M_CHECK_ACTION || HAVE_DECL_ALARM # include + # include + #endif + + #if HAVE_MALLOC_H + # include + #endif + + #ifdef M_CHECK_ACTION + /* Exit with distinguishable exit code. */ + static void sigabrt_no_core (int sig) { raise (SIGTERM); } #endif int @@ -26171,11 +27051,18 @@ int result = 0; const char *s; struct re_registers regs; + /* Some builds of glibc go into an infinite loop on this + test. Use alarm to force death, and mallopt to avoid + malloc recursion in diagnosing the corrupted heap. */ #if HAVE_DECL_ALARM - /* Some builds of glibc go into an infinite loop on this test. */ signal (SIGALRM, SIG_DFL); alarm (2); #endif +#ifdef M_CHECK_ACTION + signal (SIGABRT, sigabrt_no_core); + mallopt (M_CHECK_ACTION, 2); +#endif + if (setlocale (LC_ALL, "en_US.UTF-8")) { { @@ -26424,6 +27311,7 @@ $as_echo "#define regfree rpl_regfree" >>confdefs.h + for ac_header in libintl.h do : ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" @@ -27162,36 +28050,40 @@ else if test $ac_cv_header_selinux_selinux_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - - gl_header_literal_regex=`echo 'selinux/selinux.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_selinux_selinux_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'selinux/selinux.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_selinux_selinux_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_selinux_selinux_h + gl_cv_next_selinux_selinux_h='"'$gl_header'"' else gl_cv_next_selinux_selinux_h='<'selinux/selinux.h'>' fi @@ -27400,36 +28292,40 @@ if ${gl_cv_next_signal_h+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'signal.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' - gl_header_literal_regex=`echo 'signal.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_signal_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_cv_absolute_signal_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_signal_h + gl_cv_next_signal_h='"'$gl_header'"' fi @@ -28239,7 +29135,8 @@ else /* Test _Alignas only on platforms where gnulib can help. */ #if \ - (__GNUC__ || __IBMC__ || __IBMCPP__ \ + ((defined __cplusplus && 201103 <= __cplusplus) \ + || __GNUC__ || __IBMC__ || __IBMCPP__ || __ICC \ || 0x5110 <= __SUNPRO_C || 1300 <= _MSC_VER) struct alignas_test { char c; char alignas (8) alignas_8; }; char test_alignas[offsetof (struct alignas_test, alignas_8) == 8 @@ -28349,36 +29246,40 @@ if ${gl_cv_next_stdarg_h+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'stdarg.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_stdarg_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` - gl_header_literal_regex=`echo 'stdarg.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_stdarg_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_header=$gl_cv_absolute_stdarg_h + gl_cv_next_stdarg_h='"'$gl_header'"' fi @@ -28552,36 +29453,40 @@ if ${gl_cv_next_stddef_h+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'stddef.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_stddef_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` - gl_header_literal_regex=`echo 'stddef.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_stddef_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_header=$gl_cv_absolute_stddef_h + gl_cv_next_stddef_h='"'$gl_header'"' fi @@ -28624,36 +29529,40 @@ if ${gl_cv_next_stdio_h+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'stdio.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' - gl_header_literal_regex=`echo 'stdio.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_stdio_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_cv_absolute_stdio_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_stdio_h + gl_cv_next_stdio_h='"'$gl_header'"' fi @@ -28771,36 +29680,40 @@ if ${gl_cv_next_stdlib_h+:} false; then : $as_echo_n "(cached) " >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'stdlib.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' - gl_header_literal_regex=`echo 'stdlib.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_stdlib_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + gl_cv_absolute_stdlib_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_stdlib_h + gl_cv_next_stdlib_h='"'$gl_header'"' fi @@ -29286,6 +30199,20 @@ done fi + # This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE. + + + + + + + +$as_echo "#define my_strftime nstrftime" >>confdefs.h + + + + + @@ -29484,6 +30411,131 @@ $as_echo "#define GNULIB_TEST_STRNLEN 1" >>confdefs.h + + + + + if test "$ac_cv_have_decl_strtoimax" != yes; then + HAVE_DECL_STRTOIMAX=0 + fi + + if test "$ac_cv_func_strtoimax" = yes; then + HAVE_STRTOIMAX=1 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strtoimax works" >&5 +$as_echo_n "checking whether strtoimax works... " >&6; } +if ${gl_cv_func_strtoimax+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + case "$host_os" in + # Guess no on AIX 5. + aix5*) gl_cv_func_strtoimax="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_strtoimax="guessing yes" ;; + esac + +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +#include +int main () +{ + if (sizeof (intmax_t) > sizeof (int)) + { + const char *s = "4294967295"; + char *p; + intmax_t res; + errno = 0; + res = strtoimax (s, &p, 10); + if (p != s + strlen (s)) + return 1; + if (errno != 0) + return 2; + if (res != (intmax_t) 65535 * (intmax_t) 65537) + return 3; + } + else + { + const char *s = "2147483647"; + char *p; + intmax_t res; + errno = 0; + res = strtoimax (s, &p, 10); + if (p != s + strlen (s)) + return 1; + if (errno != 0) + return 2; + if (res != 2147483647) + return 3; + } + return 0; +} + +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_strtoimax=yes +else + gl_cv_func_strtoimax=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_strtoimax" >&5 +$as_echo "$gl_cv_func_strtoimax" >&6; } + case "$gl_cv_func_strtoimax" in + *no) REPLACE_STRTOIMAX=1 ;; + esac + else + if test "$ac_cv_have_decl_strtoimax" = yes; then + # HP-UX 11.11 has "#define strtoimax(...) ..." but no function. + REPLACE_STRTOIMAX=1 + fi + HAVE_STRTOIMAX=0 + fi + + if test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS strtoimax.$ac_objext" + + + ac_fn_c_check_decl "$LINENO" "strtoll" "ac_cv_have_decl_strtoll" "$ac_includes_default" +if test "x$ac_cv_have_decl_strtoll" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRTOLL $ac_have_decl +_ACEOF + + + + fi + + + + + + GNULIB_STRTOIMAX=1 + + + + + for ac_func in strtol do : ac_fn_c_check_func "$LINENO" "strtol" "ac_cv_func_strtol" @@ -29509,6 +30561,56 @@ done fi + + + if test "$ac_cv_type_long_long_int" = yes; then + for ac_func in strtoll +do : + ac_fn_c_check_func "$LINENO" "strtoll" "ac_cv_func_strtoll" +if test "x$ac_cv_func_strtoll" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STRTOLL 1 +_ACEOF + +fi +done + + if test $ac_cv_func_strtoll = no; then + HAVE_STRTOLL=0 + fi + fi + + if test $HAVE_STRTOLL = 0; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS strtoll.$ac_objext" + + + : + + fi + + + + + + GNULIB_STRTOLL=1 + + + + + +$as_echo "#define GNULIB_TEST_STRTOLL 1" >>confdefs.h + + + + for ac_func in strtoul do : ac_fn_c_check_func "$LINENO" "strtoul" "ac_cv_func_strtoul" @@ -29588,11 +30690,16 @@ $as_echo "#define GNULIB_TEST_STRTOULL 1" >>confdefs.h - if test "$ac_cv_have_decl_strtoumax" != yes; then + if test "$ac_cv_have_decl_strtoumax" = yes; then + if test "$ac_cv_func_strtoumax" != yes; then + # HP-UX 11.11 has "#define strtoimax(...) ..." but no function. + REPLACE_STRTOUMAX=1 + fi + else HAVE_DECL_STRTOUMAX=0 fi - if test $ac_cv_func_strtoumax = no; then + if test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; then @@ -29778,36 +30885,40 @@ else if test $ac_cv_header_sys_stat_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - - gl_header_literal_regex=`echo 'sys/stat.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_sys_stat_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'sys/stat.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_sys_stat_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_sys_stat_h + gl_cv_next_sys_stat_h='"'$gl_header'"' else gl_cv_next_sys_stat_h='<'sys/stat.h'>' fi @@ -29929,36 +31040,40 @@ else if test $ac_cv_header_sysexits_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + 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 + 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 'sysexits.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_sysexits_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'sysexits.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_sysexits_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_sysexits_h + gl_cv_next_sysexits_h='"'$gl_header'"' else gl_cv_next_sysexits_h='<'sysexits.h'>' fi @@ -30147,6 +31262,167 @@ $as_echo "#define GNULIB_TEST_TIME_R 1" >>confdefs.h + if test $ac_cv_have_decl_ttyname_r = no; then + HAVE_DECL_TTYNAME_R=0 + fi + + for ac_func in ttyname_r +do : + ac_fn_c_check_func "$LINENO" "ttyname_r" "ac_cv_func_ttyname_r" +if test "x$ac_cv_func_ttyname_r" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_TTYNAME_R 1 +_ACEOF + +fi +done + + if test $ac_cv_func_ttyname_r = no; then + HAVE_TTYNAME_R=0 + else + HAVE_TTYNAME_R=1 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ttyname_r is compatible with its POSIX signature" >&5 +$as_echo_n "checking whether ttyname_r is compatible with its POSIX signature... " >&6; } +if ${gl_cv_func_ttyname_r_posix+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include +int +main () +{ +*ttyname_r (0, NULL, 0); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_func_ttyname_r_posix=no +else + gl_cv_func_ttyname_r_posix=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ttyname_r_posix" >&5 +$as_echo "$gl_cv_func_ttyname_r_posix" >&6; } + if test $gl_cv_func_ttyname_r_posix = no; then + REPLACE_TTYNAME_R=1 + else + +$as_echo "#define HAVE_POSIXDECL_TTYNAME_R 1" >>confdefs.h + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ttyname_r works with small buffers" >&5 +$as_echo_n "checking whether ttyname_r works with small buffers... " >&6; } +if ${gl_cv_func_ttyname_r_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + + case "$host_os" in + # Guess no on Solaris. + solaris*) gl_cv_func_ttyname_r_works="guessing no" ;; + # Guess no on OSF/1. + osf*) gl_cv_func_ttyname_r_works="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_ttyname_r_works="guessing yes" ;; + esac + if test "$cross_compiling" = yes; then : + : +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#include +int +main (void) +{ + int result = 0; + int fd; + char buf[31]; /* use any size < 128 here */ + + fd = open ("/dev/tty", O_RDONLY); + if (fd < 0) + result |= 16; + else if (ttyname_r (fd, buf, sizeof (buf)) != 0) + result |= 17; + else if (ttyname_r (fd, buf, 1) == 0) + result |= 18; + return result; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_ttyname_r_works=yes +else + case $? in + 17 | 18) gl_cv_func_ttyname_r_works=no ;; + esac +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_ttyname_r_works" >&5 +$as_echo "$gl_cv_func_ttyname_r_works" >&6; } + case "$gl_cv_func_ttyname_r_works" in + *yes) ;; + *) REPLACE_TTYNAME_R=1 ;; + esac + fi + fi + + if test $HAVE_TTYNAME_R = 0 || test $REPLACE_TTYNAME_R = 1; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS ttyname_r.$ac_objext" + + + for ac_func in ttyname +do : + ac_fn_c_check_func "$LINENO" "ttyname" "ac_cv_func_ttyname" +if test "x$ac_cv_func_ttyname" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_TTYNAME 1 +_ACEOF + +fi +done + + + fi + + + + + + GNULIB_TTYNAME_R=1 + + + + + +$as_echo "#define GNULIB_TEST_TTYNAME_R 1" >>confdefs.h + + + + + + + + + @@ -30165,36 +31441,40 @@ else if test $ac_cv_header_unistd_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - - gl_header_literal_regex=`echo 'unistd.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_unistd_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'unistd.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_unistd_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_unistd_h + gl_cv_next_unistd_h='"'$gl_header'"' else gl_cv_next_unistd_h='<'unistd.h'>' fi @@ -30646,6 +31926,66 @@ $as_echo "#define USE_UNLOCKED_IO 1" >>confdefs.h + + + + for ac_func in unlockpt +do : + ac_fn_c_check_func "$LINENO" "unlockpt" "ac_cv_func_unlockpt" +if test "x$ac_cv_func_unlockpt" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_UNLOCKPT 1 +_ACEOF + +fi +done + + if test $ac_cv_func_unlockpt = no; then + HAVE_UNLOCKPT=0 + fi + + if test $HAVE_UNLOCKPT = 0; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS unlockpt.$ac_objext" + + + for ac_func in revoke +do : + ac_fn_c_check_func "$LINENO" "revoke" "ac_cv_func_revoke" +if test "x$ac_cv_func_revoke" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_REVOKE 1 +_ACEOF + +fi +done + + + fi + + + + + + GNULIB_UNLOCKPT=1 + + + + + +$as_echo "#define GNULIB_TEST_UNLOCKPT 1" >>confdefs.h + + + + + if test $ac_cv_have_decl_unsetenv = no; then HAVE_DECL_UNSETENV=0 @@ -31384,36 +32724,40 @@ else if test $ac_cv_header_wchar_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - - gl_header_literal_regex=`echo 'wchar.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_wchar_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'wchar.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_wchar_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_wchar_h + gl_cv_next_wchar_h='"'$gl_header'"' else gl_cv_next_wchar_h='<'wchar.h'>' fi @@ -31843,36 +33187,40 @@ else if test $ac_cv_header_wctype_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac - case "$host_os" in - mingw*) - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' - - gl_header_literal_regex=`echo 'wctype.h' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ - s|^/[^/]|//&| - p - q - }' - gl_cv_next_wctype_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n "$gl_absolute_header_sed"`'"' + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'wctype.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_wctype_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_wctype_h + gl_cv_next_wctype_h='"'$gl_header'"' else gl_cv_next_wctype_h='<'wctype.h'>' fi @@ -32753,6 +34101,14 @@ cat >>confdefs.h <<_ACEOF _ACEOF fi + if test "$pu_cv_header_rmt" = yes; then + PU_RMT_COND_TRUE= + PU_RMT_COND_FALSE='#' +else + PU_RMT_COND_TRUE='#' + PU_RMT_COND_FALSE= +fi + @@ -32920,12 +34276,13 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_warn_c__Werror__Wunknown_warning_option=yes else gl_cv_warn_c__Werror__Wunknown_warning_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext CFLAGS="$gl_save_compiler_FLAGS" fi @@ -32957,12 +34314,13 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_warn_c__Werror=yes else gl_cv_warn_c__Werror=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext CFLAGS="$gl_save_compiler_FLAGS" fi @@ -33146,7 +34504,6 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; } -Wmissing-include-dirs \ -Wmissing-parameter-type \ -Wmissing-prototypes \ - -Wmudflap \ -Wmultichar \ -Wnarrowing \ -Wnested-externs \ @@ -33204,6 +34561,8 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; } -Wvla \ -Wvolatile-register-var \ -Wwrite-strings \ + -fdiagnostics-show-option \ + -funit-at-a-time \ \ ; do gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item" @@ -33238,6 +34597,10 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; } for w in $ws; do as_gl_Warn=`$as_echo "gl_cv_warn_c_$w" | $as_tr_sh` +gl_positive="$w" +case $gl_positive in + -Wno-*) gl_positive=-W`expr "X$gl_positive" : 'X-Wno-\(.*\)'` ;; +esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles $w" >&5 $as_echo_n "checking whether C compiler handles $w... " >&6; } if eval \${$as_gl_Warn+:} false; then : @@ -33245,7 +34608,7 @@ if eval \${$as_gl_Warn+:} false; then : else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " $gl_unknown_warnings_are_errors $w" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors $gl_positive" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -33257,12 +34620,13 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_link "$LINENO"; then : eval "$as_gl_Warn=yes" else eval "$as_gl_Warn=no" fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext CFLAGS="$gl_save_compiler_FLAGS" fi @@ -33283,7 +34647,7 @@ if ${gl_cv_warn_c__Wno_sign_compare+:} false; then : else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-sign-compare" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wsign-compare" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -33295,12 +34659,13 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_warn_c__Wno_sign_compare=yes else gl_cv_warn_c__Wno_sign_compare=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext CFLAGS="$gl_save_compiler_FLAGS" fi @@ -33319,7 +34684,7 @@ if ${gl_cv_warn_c__Wno_type_limits+:} false; then : else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-type-limits" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wtype-limits" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -33331,12 +34696,13 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_warn_c__Wno_type_limits=yes else gl_cv_warn_c__Wno_type_limits=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext CFLAGS="$gl_save_compiler_FLAGS" fi @@ -33355,7 +34721,7 @@ if ${gl_cv_warn_c__Wno_unused_parameter+:} false; then : else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-unused-parameter" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wunused-parameter" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -33367,12 +34733,13 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_warn_c__Wno_unused_parameter=yes else gl_cv_warn_c__Wno_unused_parameter=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext CFLAGS="$gl_save_compiler_FLAGS" fi @@ -33391,7 +34758,7 @@ if ${gl_cv_warn_c__Wno_format_nonliteral+:} false; then : else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-format-nonliteral" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wformat-nonliteral" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -33403,12 +34770,13 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_warn_c__Wno_format_nonliteral=yes else gl_cv_warn_c__Wno_format_nonliteral=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext CFLAGS="$gl_save_compiler_FLAGS" fi @@ -33440,12 +34808,13 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_warn_c__fdiagnostics_show_option=yes else gl_cv_warn_c__fdiagnostics_show_option=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext CFLAGS="$gl_save_compiler_FLAGS" fi @@ -33476,12 +34845,13 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_warn_c__funit_at_a_time=yes else gl_cv_warn_c__funit_at_a_time=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext CFLAGS="$gl_save_compiler_FLAGS" fi @@ -33538,7 +34908,7 @@ if ${gl_cv_warn_c__Wno_missing_field_initializers+:} false; then : else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-missing-field-initializers" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wmissing-field-initializers" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -33550,12 +34920,13 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +if ac_fn_c_try_link "$LINENO"; then : gl_cv_warn_c__Wno_missing_field_initializers=yes else gl_cv_warn_c__Wno_missing_field_initializers=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext CFLAGS="$gl_save_compiler_FLAGS" fi @@ -33602,19 +34973,20 @@ else fi - for ac_header in attr/xattr.h + # First check for + for ac_header in sys/xattr.h do : - ac_fn_c_check_header_mongrel "$LINENO" "attr/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default" -if test "x$ac_cv_header_attr_xattr_h" = xyes; then : + ac_fn_c_check_header_mongrel "$LINENO" "sys/xattr.h" "ac_cv_header_sys_xattr_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_xattr_h" = xyes; then : cat >>confdefs.h <<_ACEOF -#define HAVE_ATTR_XATTR_H 1 +#define HAVE_SYS_XATTR_H 1 _ACEOF fi done - if test "$ac_cv_header_attr_xattr_h" = yes; then + if test "$ac_cv_header_sys_xattr_h" = yes; then TAR_COND_XATTR_H_TRUE= TAR_COND_XATTR_H_FALSE='#' else @@ -33622,7 +34994,15 @@ else TAR_COND_XATTR_H_FALSE= fi - if test "$ac_cv_header_attr_xattr_h" = yes; then + if false; then + TAR_LIB_ATTR_TRUE= + TAR_LIB_ATTR_FALSE='#' +else + TAR_LIB_ATTR_TRUE='#' + TAR_LIB_ATTR_FALSE= +fi + + if test "$ac_cv_header_sys_xattr_h" = yes; then for ac_func in getxattr fgetxattr lgetxattr \ setxattr fsetxattr lsetxattr \ listxattr flistxattr llistxattr @@ -33635,7 +35015,7 @@ if eval test \"x\$"$as_ac_var"\" = x"yes"; then : _ACEOF # only when functions are present -$as_echo "#define HAVE_ATTR_XATTR_H 1" >>confdefs.h +$as_echo "#define HAVE_SYS_XATTR_H 1" >>confdefs.h if test "$with_xattrs" != no; then @@ -33648,12 +35028,122 @@ done fi + # If is not found, then check for + if test "$ac_cv_header_sys_xattr_h" != yes; then + for ac_header in attr/xattr.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "attr/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default" +if test "x$ac_cv_header_attr_xattr_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ATTR_XATTR_H 1 +_ACEOF + +fi + +done + + if test "$ac_cv_header_attr_xattr_h" = yes; then + TAR_COND_XATTR_H_TRUE= + TAR_COND_XATTR_H_FALSE='#' +else + TAR_COND_XATTR_H_TRUE='#' + TAR_COND_XATTR_H_FALSE= +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgetxattr in -lattr" >&5 +$as_echo_n "checking for fgetxattr in -lattr... " >&6; } +if ${ac_cv_lib_attr_fgetxattr+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lattr $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 fgetxattr (); +int +main () +{ +return fgetxattr (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_attr_fgetxattr=yes +else + ac_cv_lib_attr_fgetxattr=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_attr_fgetxattr" >&5 +$as_echo "$ac_cv_lib_attr_fgetxattr" >&6; } +if test "x$ac_cv_lib_attr_fgetxattr" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBATTR 1 +_ACEOF + + LIBS="-lattr $LIBS" + +fi + + if test "$ac_cv_lib_attr_fgetxattr" = yes; then + TAR_LIB_ATTR_TRUE= + TAR_LIB_ATTR_FALSE='#' +else + TAR_LIB_ATTR_TRUE='#' + TAR_LIB_ATTR_FALSE= +fi + + if test "$ac_cv_header_attr_xattr_h" = yes; then + for ac_func in getxattr fgetxattr lgetxattr \ + setxattr fsetxattr lsetxattr \ + listxattr flistxattr llistxattr +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 + # only when functions are present + +$as_echo "#define HAVE_ATTR_XATTR_H 1" >>confdefs.h + + if test "$with_xattrs" != no; then + +$as_echo "#define HAVE_XATTRS /**/" >>confdefs.h + + fi + +fi +done + + fi + fi + + if test $ac_cv_func_grantpt = yes; then + TAR_COND_GRANTPT_TRUE= + TAR_COND_GRANTPT_FALSE='#' +else + TAR_COND_GRANTPT_TRUE='#' + TAR_COND_GRANTPT_FALSE= +fi + ac_fn_c_check_decl "$LINENO" "getgrgid" "ac_cv_have_decl_getgrgid" "#include " @@ -34997,6 +36487,75 @@ fi # Gettext. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } +if ${ac_cv_path_SED+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + { ac_script=; unset ac_script;} + if test -z "$SED"; then + ac_path_SED_found=false + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + as_fn_executable_p "$ac_path_SED" || continue +# Check for GNU ac_path_SED and select it if it is found. + # Check for GNU $ac_path_SED +case `"$ac_path_SED" --version 2>&1` in +*GNU*) + ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; +*) + ac_count=0 + $as_echo_n 0123456789 >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + $as_echo '' >> "conftest.nl" + "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + as_fn_arith $ac_count + 1 && ac_count=$as_val + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_SED="$ac_path_SED" + ac_path_SED_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + $ac_path_SED_found && break 3 + done + done + done +IFS=$as_save_IFS + if test -z "$ac_cv_path_SED"; then + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 + fi +else + ac_cv_path_SED=$SED +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5 +$as_echo "$ac_cv_path_SED" >&6; } + SED="$ac_cv_path_SED" + rm -f conftest.sed + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 $as_echo_n "checking whether NLS is requested... " >&6; } @@ -36620,10 +38179,30 @@ fi gltests_LTLIBOBJS=$gltests_ltlibobjs +if test -z "${PU_RMT_COND_TRUE}" && test -z "${PU_RMT_COND_FALSE}"; then + as_fn_error $? "conditional \"PU_RMT_COND\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${TAR_COND_XATTR_H_TRUE}" && test -z "${TAR_COND_XATTR_H_FALSE}"; then + as_fn_error $? "conditional \"TAR_COND_XATTR_H\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${TAR_LIB_ATTR_TRUE}" && test -z "${TAR_LIB_ATTR_FALSE}"; then + as_fn_error $? "conditional \"TAR_LIB_ATTR\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${TAR_COND_XATTR_H_TRUE}" && test -z "${TAR_COND_XATTR_H_FALSE}"; then as_fn_error $? "conditional \"TAR_COND_XATTR_H\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${TAR_LIB_ATTR_TRUE}" && test -z "${TAR_LIB_ATTR_FALSE}"; then + as_fn_error $? "conditional \"TAR_LIB_ATTR\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${TAR_COND_GRANTPT_TRUE}" && test -z "${TAR_COND_GRANTPT_FALSE}"; then + as_fn_error $? "conditional \"TAR_COND_GRANTPT\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi : "${CONFIG_STATUS=./config.status}" ac_write_fail=0 @@ -37021,7 +38600,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 tar $as_me 1.27, which was +This file was extended by GNU tar $as_me 1.28, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -37089,7 +38668,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 tar config.status 1.27 +GNU tar config.status 1.28 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -37836,7 +39415,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -37887,7 +39466,7 @@ $as_echo X"$mf" | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the diff --git a/configure.ac b/configure.ac index 3bff70e..a93c6c0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # Configure template for GNU tar. -*- autoconf -*- -# Copyright 1991, 1994-2010, 2013 Free Software Foundation, Inc. +# Copyright 1991, 1994-2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. @@ -17,24 +17,24 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -AC_INIT([GNU tar], [1.27], [bug-tar@gnu.org]) +AC_INIT([GNU tar], [1.28], [bug-tar@gnu.org]) AC_CONFIG_SRCDIR([src/tar.c]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) AC_PREREQ([2.63]) -AM_INIT_AUTOMAKE([1.11 gnits tar-ustar dist-bzip2 dist-xz dist-shar std-options silent-rules]) +AM_INIT_AUTOMAKE([1.11 gnits tar-ustar dist-bzip2 dist-xz std-options silent-rules]) # Enable silent rules by default: AM_SILENT_RULES([yes]) -AC_PROG_CC +AC_PROG_CC_STDC AC_EXEEXT AC_PROG_RANLIB AC_PROG_YACC gl_EARLY +AC_CHECK_TOOLS([AR], [ar]) AC_SYS_LARGEFILE -AC_ISC_POSIX AC_C_INLINE AC_CHECK_HEADERS_ONCE(fcntl.h linux/fd.h memory.h net/errno.h \ @@ -49,12 +49,7 @@ AC_CHECK_HEADERS([sys/buf.h], [], [], #include #endif]) -AC_HEADER_SYS_WAIT - -AC_HEADER_DIRENT AC_HEADER_MAJOR -AC_HEADER_STAT -AC_HEADER_STDC AC_MSG_CHECKING([for st_fstype string in struct stat]) AC_CACHE_VAL(diff_cv_st_fstype_string, @@ -74,11 +69,13 @@ fi AC_ARG_WITH([posix-acls], AS_HELP_STRING([--without-posix-acls], [do not use POSIX.1e access control lists]), - [with_posix_acls=no]) + [], + [with_posix_acls=yes]) if test "x$with_posix_acls" != "xno"; then AC_CHECK_HEADERS(sys/acl.h,, [with_posix_acls=no]) for tar_acl_func in acl_get_file acl_get_fd acl_set_file acl_set_fd \ - acl_to_text acl_from_text; do \ + acl_to_text acl_from_text acl_delete_def_file \ + acl_free; do \ test "x$with_posix_acls" = xno && break AC_SEARCH_LIBS([$tar_acl_func], [acl pacl], [], [with_posix_acls=no]) done @@ -90,11 +87,9 @@ else export enable_acl=no fi -AC_TYPE_SIGNAL AC_TYPE_MODE_T AC_TYPE_PID_T AC_TYPE_OFF_T -AC_TYPE_SIZE_T AC_TYPE_UID_T AC_CHECK_TYPE(major_t, , AC_DEFINE(major_t, int, [Type of major device numbers.])) @@ -209,7 +204,8 @@ fi TAR_HEADERS_ATTR_XATTR_H -AC_CHECK_FUNCS_ONCE([fchmod fchown fsync lstat mkfifo readlink symlink]) +AC_CHECK_FUNCS_ONCE([fchmod fchown fsync lstat mkfifo readlink symlink grantpt]) +AM_CONDITIONAL([TAR_COND_GRANTPT], [test $ac_cv_func_grantpt = yes]) AC_CHECK_DECLS([getgrgid],,, [#include ]) AC_CHECK_DECLS([getpwuid],,, [#include ]) diff --git a/doc/Makefile.am b/doc/Makefile.am index b45d70e..b654941 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,7 +1,7 @@ # Makefile for GNU tar documentation. -# Copyright 1994-1997, 1999-2001, 2003, 2006-2007, 2013 Free Software -# Foundation, Inc. +# Copyright 1994-1997, 1999-2001, 2003, 2006-2007, 2013-2014 Free +# Software Foundation, Inc. # This file is part of GNU tar. @@ -32,7 +32,13 @@ tar_TEXINFOS = \ snapshot.texi\ sparse.texi\ value.texi -EXTRA_DIST = gendocs_template mastermenu.el texify.sed untabify.el + +dist_man_MANS=tar.1 $(RMT_8) +if PU_RMT_COND + RMT_8=rmt.8 +endif + +EXTRA_DIST = gendocs_template mastermenu.el texify.sed untabify.el rmt.8 # The rendering level is anyone of PUBLISH, DISTRIB or PROOF. # Just call 'make RENDITION=PROOF [target]' if you want PROOF rendition. diff --git a/doc/Makefile.in b/doc/Makefile.in index 9f81366..ca44f1a 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.6 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,8 +16,8 @@ # Makefile for GNU tar documentation. -# Copyright 1994-1997, 1999-2001, 2003, 2006-2007, 2013 Free Software -# Foundation, Inc. +# Copyright 1994-1997, 1999-2001, 2003, 2006-2007, 2013-2014 Free +# Software Foundation, Inc. # This file is part of GNU tar. @@ -34,23 +34,51 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,16 +97,16 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = doc -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/stamp-vti $(srcdir)/version.texi $(tar_TEXINFOS) \ - $(top_srcdir)/build-aux/mdate-sh \ - $(top_srcdir)/build-aux/texinfo.tex +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(tar_TEXINFOS) $(top_srcdir)/build-aux/mdate-sh \ + $(srcdir)/version.texi $(srcdir)/stamp-vti \ + $(top_srcdir)/build-aux/texinfo.tex $(dist_man_MANS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ - $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/alloca.m4 \ - $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/backupfile.m4 \ - $(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/btowc.m4 \ - $(top_srcdir)/m4/canonicalize.m4 \ + $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/acl.m4 \ + $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argp.m4 \ + $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \ + $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/chown.m4 \ $(top_srcdir)/m4/clock_time.m4 \ $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ @@ -90,9 +118,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup.m4 \ $(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/eealloc.m4 \ $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/errno_h.m4 \ - $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exponentd.m4 \ - $(top_srcdir)/m4/extensions.m4 \ - $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fchdir.m4 \ + $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/euidaccess.m4 \ + $(top_srcdir)/m4/exponentd.m4 $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/extern-inline.m4 \ + $(top_srcdir)/m4/faccessat.m4 $(top_srcdir)/m4/fchdir.m4 \ $(top_srcdir)/m4/fchmodat.m4 $(top_srcdir)/m4/fchownat.m4 \ $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl.m4 \ $(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fdopendir.m4 \ @@ -104,19 +133,21 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/m4/getcwd-path-max.m4 $(top_srcdir)/m4/getcwd.m4 \ $(top_srcdir)/m4/getdelim.m4 $(top_srcdir)/m4/getdtablesize.m4 \ - $(top_srcdir)/m4/getline.m4 $(top_srcdir)/m4/getopt.m4 \ - $(top_srcdir)/m4/getpagesize.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gettime.m4 $(top_srcdir)/m4/gettimeofday.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/human.m4 \ + $(top_srcdir)/m4/getgroups.m4 $(top_srcdir)/m4/getline.m4 \ + $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/getpagesize.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettime.m4 \ + $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ + $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 \ + $(top_srcdir)/m4/group-member.m4 $(top_srcdir)/m4/human.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/include_next.m4 \ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \ $(top_srcdir)/m4/inttostr.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ - $(top_srcdir)/m4/iswblank.m4 $(top_srcdir)/m4/langinfo_h.m4 \ - $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lchown.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/isatty.m4 $(top_srcdir)/m4/iswblank.m4 \ + $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ + $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ $(top_srcdir)/m4/link-follow.m4 $(top_srcdir)/m4/link.m4 \ $(top_srcdir)/m4/linkat.m4 $(top_srcdir)/m4/localcharset.m4 \ @@ -142,19 +173,21 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/paxutils.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf.m4 \ - $(top_srcdir)/m4/priv-set.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ - $(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \ - $(top_srcdir)/m4/read.m4 $(top_srcdir)/m4/readdir.m4 \ - $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/readlinkat.m4 \ - $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.m4 \ - $(top_srcdir)/m4/rename.m4 $(top_srcdir)/m4/renameat.m4 \ - $(top_srcdir)/m4/rewinddir.m4 $(top_srcdir)/m4/rmdir.m4 \ - $(top_srcdir)/m4/rmt.m4 $(top_srcdir)/m4/rpmatch.m4 \ - $(top_srcdir)/m4/rtapelib.m4 $(top_srcdir)/m4/safe-read.m4 \ - $(top_srcdir)/m4/safe-write.m4 $(top_srcdir)/m4/save-cwd.m4 \ - $(top_srcdir)/m4/savedir.m4 $(top_srcdir)/m4/secure_getenv.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix_openpt.m4 \ + $(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/priv-set.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/ptsname.m4 \ + $(top_srcdir)/m4/ptsname_r.m4 $(top_srcdir)/m4/quote.m4 \ + $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/raise.m4 \ + $(top_srcdir)/m4/rawmemchr.m4 $(top_srcdir)/m4/read.m4 \ + $(top_srcdir)/m4/readdir.m4 $(top_srcdir)/m4/readlink.m4 \ + $(top_srcdir)/m4/readlinkat.m4 $(top_srcdir)/m4/realloc.m4 \ + $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rename.m4 \ + $(top_srcdir)/m4/renameat.m4 $(top_srcdir)/m4/rewinddir.m4 \ + $(top_srcdir)/m4/rmdir.m4 $(top_srcdir)/m4/rmt.m4 \ + $(top_srcdir)/m4/rpmatch.m4 $(top_srcdir)/m4/rtapelib.m4 \ + $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/safe-write.m4 \ + $(top_srcdir)/m4/save-cwd.m4 $(top_srcdir)/m4/savedir.m4 \ + $(top_srcdir)/m4/secure_getenv.m4 \ $(top_srcdir)/m4/selinux-context-h.m4 \ $(top_srcdir)/m4/selinux-selinux-h.m4 \ $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/signal_h.m4 \ @@ -167,20 +200,23 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \ $(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \ - $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strings_h.m4 $(top_srcdir)/m4/strndup.m4 \ - $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strtol.m4 \ - $(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \ - $(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/symlink.m4 \ - $(top_srcdir)/m4/symlinkat.m4 $(top_srcdir)/m4/sys_socket_h.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strftime.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \ + $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ + $(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \ + $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \ + $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \ + $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/symlinkat.m4 \ + $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sysexits.m4 \ $(top_srcdir)/m4/system.m4 $(top_srcdir)/m4/tempname.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ - $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \ - $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkat.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \ + $(top_srcdir)/m4/ttyname_r.m4 $(top_srcdir)/m4/unistd-safer.m4 \ + $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ + $(top_srcdir)/m4/unlinkat.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/unlockpt.m4 \ $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utimens.m4 \ $(top_srcdir)/m4/utimensat.m4 $(top_srcdir)/m4/utimes.m4 \ $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ @@ -259,7 +295,8 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -am__installdirs = "$(DESTDIR)$(infodir)" +am__installdirs = "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" \ + "$(DESTDIR)$(man8dir)" am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -287,6 +324,11 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } +man1dir = $(mandir)/man1 +man8dir = $(mandir)/man8 +NROFF = nroff +MANS = $(dist_man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ @@ -855,6 +897,7 @@ LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@ LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ LIB_ACL = @LIB_ACL@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_EACCESS = @LIB_EACCESS@ LIB_SELINUX = @LIB_SELINUX@ LIB_SETSOCKOPT = @LIB_SETSOCKOPT@ LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ @@ -970,11 +1013,13 @@ REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ +REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ +REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ @@ -983,6 +1028,7 @@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ REPLACE_LOCALECONV = @REPLACE_LOCALECONV@ +REPLACE_LOCALTIME = @REPLACE_LOCALTIME@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ REPLACE_LSTAT = @REPLACE_LSTAT@ @@ -1049,6 +1095,7 @@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOD = @REPLACE_STRTOD@ REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ +REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ @@ -1076,6 +1123,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ RSH = @RSH@ +SED = @SED@ SELINUX_CONTEXT_H = @SELINUX_CONTEXT_H@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -1113,6 +1161,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -1157,6 +1206,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1180,7 +1230,9 @@ tar_TEXINFOS = \ sparse.texi\ value.texi -EXTRA_DIST = gendocs_template mastermenu.el texify.sed untabify.el +dist_man_MANS = tar.1 $(RMT_8) +@PU_RMT_COND_TRUE@RMT_8 = rmt.8 +EXTRA_DIST = gendocs_template mastermenu.el texify.sed untabify.el rmt.8 # The rendering level is anyone of PUBLISH, DISTRIB or PROOF. # Just call 'make RENDITION=PROOF [target]' if you want PROOF rendition. @@ -1248,25 +1300,23 @@ $(am__aclocal_m4_deps): .texi.dvi: $(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ - $(TEXI2DVI) $(AM_V_texinfo) --clean $< $(AM_V_texidevnull) + $(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \ + $< .texi.pdf: $(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ - $(TEXI2PDF) $(AM_V_texinfo) --clean $< $(AM_V_texidevnull) + $(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \ + $< .texi.html: $(AM_V_MAKEINFO)rm -rf $(@:.html=.htp) $(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \ -o $(@:.html=.htp) $<; \ then \ - rm -rf $@; \ - if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ - mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \ + rm -rf $@ && mv $(@:.html=.htp) $@; \ else \ - if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \ - rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ - exit 1; \ + rm -rf $(@:.html=.htp); exit 1; \ fi $(srcdir)/tar.info: tar.texi $(srcdir)/version.texi $(tar_TEXINFOS) tar.dvi: tar.texi $(srcdir)/version.texi $(tar_TEXINFOS) @@ -1372,8 +1422,7 @@ dist-info: $(INFO_DEPS) done mostlyclean-aminfo: - -rm -rf tar.aux tar.cp tar.cps tar.fn tar.kw tar.ky tar.log tar.op tar.ops \ - tar.pg tar.tmp tar.toc tar.tp tar.tps tar.vr + -rm -rf tar.t2d tar.t2p clean-aminfo: -test -z "tar.dvi tar.pdf tar.ps tar.html" \ @@ -1385,11 +1434,95 @@ maintainer-clean-aminfo: echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \ rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \ done -tags: TAGS -TAGS: +install-man1: $(dist_man_MANS) + @$(NORMAL_INSTALL) + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ + } | while read p; do \ + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; echo "$$p"; \ + done | \ + sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ + sed 'N;N;s,\n, ,g' | { \ + list=; while read file base inst; do \ + if test "$$base" = "$$inst"; then list="$$list $$file"; else \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ + fi; \ + done; \ + for i in $$list; do echo "$$i"; done | $(am__base_list) | \ + while read files; do \ + test -z "$$files" || { \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ + done; } -ctags: CTAGS -CTAGS: +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list=''; test -n "$(man1dir)" || exit 0; \ + files=`{ for i in $$list; do echo "$$i"; done; \ + l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + sed -n '/\.1[a-z]*$$/p'; \ + } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) +install-man8: $(dist_man_MANS) + @$(NORMAL_INSTALL) + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man8dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.8[a-z]*$$/p'; \ + fi; \ + } | while read p; do \ + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; echo "$$p"; \ + done | \ + sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ + sed 'N;N;s,\n, ,g' | { \ + list=; while read file base inst; do \ + if test "$$base" = "$$inst"; then list="$$list $$file"; else \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \ + fi; \ + done; \ + for i in $$list; do echo "$$i"; done | $(am__base_list) | \ + while read files; do \ + test -z "$$files" || { \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \ + done; } + +uninstall-man8: + @$(NORMAL_UNINSTALL) + @list=''; test -n "$(man8dir)" || exit 0; \ + files=`{ for i in $$list; do echo "$$i"; done; \ + l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + sed -n '/\.8[a-z]*$$/p'; \ + } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ + dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: cscope cscopelist: @@ -1429,9 +1562,9 @@ distdir: $(DISTFILES) dist-info check-am: all-am check: check-am -all-am: Makefile $(INFO_DEPS) +all-am: Makefile $(INFO_DEPS) $(MANS) installdirs: - for dir in "$(DESTDIR)$(infodir)"; do \ + for dir in "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man8dir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-am @@ -1484,7 +1617,7 @@ info: info-am info-am: $(INFO_DEPS) -install-data-am: install-info-am +install-data-am: install-info-am install-man install-dvi: install-dvi-am @@ -1567,7 +1700,7 @@ install-info-am: $(INFO_DEPS) install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\ done; \ else : ; fi -install-man: +install-man: install-man1 install-man8 install-pdf: install-pdf-am @@ -1621,23 +1754,27 @@ ps: ps-am ps-am: $(PSS) uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \ - uninstall-pdf-am uninstall-ps-am + uninstall-man uninstall-pdf-am uninstall-ps-am + +uninstall-man: uninstall-man1 uninstall-man8 .MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-aminfo clean-generic \ - clean-local dist-info distclean distclean-generic distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ + clean-local cscopelist-am ctags-am dist-info distclean \ + distclean-generic distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-man8 install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-aminfo maintainer-clean-generic \ maintainer-clean-vti mostlyclean mostlyclean-aminfo \ mostlyclean-generic mostlyclean-vti pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-dvi-am uninstall-html-am \ - uninstall-info-am uninstall-pdf-am uninstall-ps-am + tags-am uninstall uninstall-am uninstall-dvi-am \ + uninstall-html-am uninstall-info-am uninstall-man \ + uninstall-man1 uninstall-man8 uninstall-pdf-am uninstall-ps-am header.texi: $(top_srcdir)/src/tar.h diff --git a/doc/dumpdir.texi b/doc/dumpdir.texi index 7af3ba7..76af48e 100644 --- a/doc/dumpdir.texi +++ b/doc/dumpdir.texi @@ -1,5 +1,5 @@ @c This is part of the paxutils manual. -@c Copyright (C) 2006, 2007 Free Software Foundation, Inc. +@c Copyright (C) 2006-2007, 2014 Free Software Foundation, Inc. @c Written by Sergey Poznyakoff @c This file is distributed under GFDL 1.1 or any later version @c published by the Free Software Foundation. diff --git a/doc/fdl.texi b/doc/fdl.texi index fc19ddd..fed27fe 100644 --- a/doc/fdl.texi +++ b/doc/fdl.texi @@ -5,7 +5,8 @@ @c hence no sectioning command or @node. @display -Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. +Copyright @copyright{} 2000-2002, 2007-2008, 2014 Free Software +Foundation, Inc. @uref{http://fsf.org/} Everyone is permitted to copy and distribute verbatim copies diff --git a/doc/gendocs_template b/doc/gendocs_template index 0af20fd..ef1ff41 100755 --- a/doc/gendocs_template +++ b/doc/gendocs_template @@ -106,7 +106,7 @@ Please send broken links and other corrections (or suggestions) to

-Copyright 2004, 2013 Free Software Foundation, Inc., +Copyright 2004, 2013-2014 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111, USA
Verbatim copying and distribution of this entire article is diff --git a/doc/header.texi b/doc/header.texi index f7625c7..9f8595d 100644 --- a/doc/header.texi +++ b/doc/header.texi @@ -1,7 +1,7 @@ @comment GNU tar Archive Format description. @comment -@comment Copyright 1988-1989, 1991-1997, 2000-2001, 2003-2007, 2012-2013 -@comment Free Software Foundation, Inc. +@comment Copyright 1988-1989, 1991-1997, 2000-2001, 2003-2007, 2012-2014 Free +@comment Software Foundation, Inc. @comment @comment This file is part of GNU tar. @comment diff --git a/doc/intern.texi b/doc/intern.texi index 7a918c4..f516973 100644 --- a/doc/intern.texi +++ b/doc/intern.texi @@ -1,5 +1,5 @@ @c This is part of the paxutils manual. -@c Copyright (C) 2006 Free Software Foundation, Inc. +@c Copyright (C) 2006, 2014 Free Software Foundation, Inc. @c This file is distributed under GFDL 1.1 or any later version @c published by the Free Software Foundation. diff --git a/doc/mastermenu.el b/doc/mastermenu.el index c7af88f..dcc8dd1 100644 --- a/doc/mastermenu.el +++ b/doc/mastermenu.el @@ -1,6 +1,6 @@ ;;; mastermenu.el --- Redefinition of texinfo-master-menu-list -;; Copyright 2006-2007, 2013 Free Software Foundation, Inc. +;; Copyright 2006-2007, 2013-2014 Free Software Foundation, Inc. ;; Author: Sergey Poznyakoff ;; Maintainer: bug-tar@gnu.org diff --git a/doc/parse-datetime.texi b/doc/parse-datetime.texi index 6b3e973..7fa3c9e 100644 --- a/doc/parse-datetime.texi +++ b/doc/parse-datetime.texi @@ -1,6 +1,6 @@ @c GNU date syntax documentation -@c Copyright (C) 1994-2006, 2009-2013 Free Software Foundation, Inc. +@c Copyright (C) 1994-2006, 2009-2014 Free Software Foundation, Inc. @c Permission is granted to copy, distribute and/or modify this document @c under the terms of the GNU Free Documentation License, Version 1.3 or diff --git a/doc/rendition.texi b/doc/rendition.texi index 493b325..f008fff 100644 --- a/doc/rendition.texi +++ b/doc/rendition.texi @@ -1,5 +1,5 @@ @c This is part of GNU tar manual. -@c Copyright 1992, 1994-1997, 1999-2004, 2006, 2013 Free Software +@c Copyright 1992, 1994-1997, 1999-2004, 2006, 2013-2014 Free Software @c Foundation, Inc. @c See file tar.texi for copying conditions. diff --git a/doc/rmt.8 b/doc/rmt.8 new file mode 100644 index 0000000..7550277 --- /dev/null +++ b/doc/rmt.8 @@ -0,0 +1,254 @@ +.\" This file is part of GNU tar. -*- nroff -*- +.\" Copyright 2013 Free Software Foundation, Inc. +.\" +.\" GNU tar is free software; you can redistribute it and/or modify +.\" it under the terms of the GNU General Public License as published by +.\" the Free Software Foundation; either version 3 of the License, or +.\" (at your option) any later version. +.\" +.\" GNU tar is distributed in the hope that it will be useful, +.\" but WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" +.\" You should have received a copy of the GNU General Public License +.\" along with this program. If not, see . +.TH RMT 1 "January 27, 2014" "RMT" "GNU TAR Manual" +.SH NAME +rmt \- remote magnetic tape server +.SH SYNOPSIS +.B rmt +.SH DESCRIPTION +.B Rmt +provides remote access to files and devices for +.BR tar (1), +.BR cpio (1), +and similar backup utilities. It is normally called by running +.BR rsh (1) +or +.BR ssh (1) +to the remote machine, optionally using a different +login name if one is supplied. +.PP +The calling program communicates with +.B rmt +by sending requests on its standard input and reading replies from the +standard output. A request consists of a request letter followed by +an argument (if required) and a newline character. Additional data, +if any, are sent after the newline. On success, +.B rmt +returns +.PP +.in +4 +.BI A number \en +.PP +where \fInumber\fR is an ASCII representation of a decimal return +code. Additional data are returned after this line. On error, the +following response is returned: +.PP +.in +4 +.BI E errno \en error-message \en +.PP +where \fIerrno\fR is one of the system error codes, as described in +.BR errno (3), +and \fIerror-message\fR is a one-line human-readable description of +the error, as printed by +.BR perror (3). +.PP +Available commands and possible responses are discussed in detail in +the subsequent section. +.SH COMMANDS +.TP +.BI O device \en flags \en +Opens the \fIdevice\fR with given \fIflags\fR. If a +device had already been opened, it is closed before opening the new one. +.sp +.B Arguments +.RS +.TP +.I device +The name of the device to open. +.TP +.I flags +Flags for +.BR open (2): +a decimal number, or any valid \fBO_*\fR constant from +.B fcntl.h +(the initial \fBO_\fR may be omitted), or a bitwise or (using \fB|\fR) +of any number of these, e.g.: +.in +4 +.EX +576 +64|512 +CREAT|TRUNC +.EE +.RS +In addition, a combined form is also allowed, i.e. a decimal mode followed +by its symbolic representation. In this case the symbolic representation +is given preference. +.RE +.sp +.B Reply +.RS +.B A0\en +on success. +.RE +.sp +.B Extensions +.RS +BSD version allows only decimal number as \fIflags\fR. +.RE 1 +.TP +\fBC\fR[\fIdevice\fR]\fB\en\fR +Close the currently open device. +.RS +.TP +.B Arguments +.br +Any arguments are silently ignored. +.TP +.B Reply +.br +.B A0\en +on success. +.RE +.TP +.BI L whence \en offset \en +.RS +Performs an +.BR lseek (2) +on the currently open device with the specified +parameters. +.TP +.B Arguments +.RS +.TP +.I whence +Where to measure offset from. Valid values are: +.sp +.nf +.ta 1n 20n + 0, SET, SEEK_SET seek from the file beginning + 1, CUR, SEEK_CUR seek from the current location + 2, END, SEEK_END seek from the file end +.fi +.RE +.TP +.B Reply +.br +.BI A offset \en +on success. The \fIoffset\fR is the new offset in file. +.TP +.B Extensions +BSD version allows only 0,1,2 as \fIwhence\fR. +.RE +.TP +.BI R count \en +.br +Read \fIcount\fR bytes of data from the current device. +.RS +.TP +.B Arguments +.RS +.TP +.I count +number of bytes to read. +.RE +.TP +.B Reply +.br +On success: +.sp +.in +4 +.BI A rdcount \en +.in +.sp +followed by \fIrdcount\fR bytes of data read from the device. +.RE +.TP +.BI W count \en +Writes data onto the current device. The command is followed by +\fIcount\fR bytes of input data. +.RS +.TP +.B Arguments +.RS +.TP +.I count +Number of bytes to write. +.RE +.TP +.B Reply +.br +On success: \fBA\fIwrcount\fB\en\fR, where \fIwrcount\fR is the number of +bytes actually written. +.RE +.TP +.BI I opcode \en count \en +Perform a +.B MTIOCOP +.BR ioctl (2) +command with the specified paramedters. +.RS +.TP +.B Arguments +.RS +.TP +.I opcode +.B MTIOCOP +operation code. +.TP +.I count +mt_count. +.RE +.TP +.B Reply +.br +On success: \fBA0\en\fR. +.RE +.TP +.B S\en +Returns the status of the currently open device, as obtained from a +.B MTIOCGET +.BR ioctl (2) +call. +.RS +.TP +.B Arguments +.br +None +.TP +.B Reply +.br +On success: \fBA\fIcount\fB\en\fR followed by \fIcount\fR bytes of +data. +.RE +.SH "SEE ALSO" +.BR tar (1). +.SH BUGS +Using this utility as a general-purpose remote file access tool is +discouraged. +.SH "BUG REPORTS" +Report bugs to . +.SH HISTORY +The +.B rmt +command appeared in 4.2BSD. The GNU +.BR rmt +is written from scratch, using the BSD specification. +.SH COPYRIGHT +Copyright \(co 2013 Free Software Foundation, Inc. +.br +.na +License GPLv3+: GNU GPL version 3 or later +.br +.ad +This is free software: you are free to change and redistribute it. +There is NO WARRANTY, to the extent permitted by law. +.\" Local variables: +.\" eval: (add-hook 'write-file-hooks 'time-stamp) +.\" time-stamp-start: ".TH [A-Z_][A-Z0-9_.\\-]* [0-9] \"" +.\" time-stamp-format: "%:B %:d, %:y" +.\" time-stamp-end: "\"" +.\" time-stamp-line-limit: 20 +.\" end: diff --git a/doc/snapshot.texi b/doc/snapshot.texi index ed394a4..f57e55f 100644 --- a/doc/snapshot.texi +++ b/doc/snapshot.texi @@ -1,5 +1,5 @@ @c This is part of the paxutils manual. -@c Copyright (C) 2005, 2007 Free Software Foundation, Inc. +@c Copyright (C) 2005, 2007, 2014 Free Software Foundation, Inc. @c Written by Sergey Poznyakoff @c This file is distributed under GFDL 1.1 or any later version @c published by the Free Software Foundation. diff --git a/doc/sparse.texi b/doc/sparse.texi index bd8f75f..1bbccfc 100644 --- a/doc/sparse.texi +++ b/doc/sparse.texi @@ -1,5 +1,5 @@ @c This is part of the paxutils manual. -@c Copyright (C) 2006 Free Software Foundation, Inc. +@c Copyright (C) 2006, 2014 Free Software Foundation, Inc. @c This file is distributed under GFDL 1.1 or any later version @c published by the Free Software Foundation. diff --git a/doc/stamp-vti b/doc/stamp-vti index 905e035..85496ec 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 24 September 2013 -@set UPDATED-MONTH September 2013 -@set EDITION 1.27 -@set VERSION 1.27 +@set UPDATED 22 July 2014 +@set UPDATED-MONTH July 2014 +@set EDITION 1.28 +@set VERSION 1.28 diff --git a/doc/tar-snapshot-edit.texi b/doc/tar-snapshot-edit.texi index 697a409..9dc96f5 100644 --- a/doc/tar-snapshot-edit.texi +++ b/doc/tar-snapshot-edit.texi @@ -1,5 +1,5 @@ @c This is part of the paxutils manual. -@c Copyright (C) 2007 Free Software Foundation, Inc. +@c Copyright (C) 2007, 2014 Free Software Foundation, Inc. @c This file is distributed under GFDL 1.1 or any later version @c published by the Free Software Foundation. diff --git a/doc/tar.1 b/doc/tar.1 new file mode 100644 index 0000000..d256a0a --- /dev/null +++ b/doc/tar.1 @@ -0,0 +1,1174 @@ +.\" This file is part of GNU tar. -*- nroff -*- +.\" Copyright 2013-2014 Free Software Foundation, Inc. +.\" +.\" GNU tar is free software; you can redistribute it and/or modify +.\" it under the terms of the GNU General Public License as published by +.\" the Free Software Foundation; either version 3 of the License, or +.\" (at your option) any later version. +.\" +.\" GNU tar is distributed in the hope that it will be useful, +.\" but WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" +.\" You should have received a copy of the GNU General Public License +.\" along with this program. If not, see . +.TH TAR 1 "February 22, 2014" "TAR" "GNU TAR Manual" +.SH NAME +tar \- an archiving utility +.SH SYNOPSIS +.SS Traditional usage +\fBtar\fR {\fBA\fR|\fBc\fR|\fBd\fR|\fBr\fR|\fBt\fR|\fBu\fR|\fBx\fR}\ +[\fBGnSkUWOmpsMBiajJzZhPlRvwo\fR] [\fIARG\fR...] +.SS UNIX-style usage +.sp +\fBtar\fR \fB\-A\fR [\fIOPTIONS\fR] \fIARCHIVE\fR \fIARCHIVE\fR +.sp +\fBtar\fR \fB\-c\fR [\fB\-f\fR \fIARCHIVE\fR] [\fIOPTIONS\fR] [\fIFILE\fR...] +.sp +\fBtar\fR \fB\-d\fR [\fB\-f\fR \fIARCHIVE\fR] [\fIOPTIONS\fR] [\fIFILE\fR...] +.sp +\fBtar\fR \fB\-t\fR [\fB\-f\fR \fIARCHIVE\fR] [\fIOPTIONS\fR] [\fIMEMBER\fR...] +.sp +\fBtar\fR \fB\-r\fR [\fB\-f\fR \fIARCHIVE\fR] [\fIOPTIONS\fR] [\fIFILE\fR...] +.sp +\fBtar\fR \fB\-u\fR [\fB\-f\fR \fIARCHIVE\fR] [\fIOPTIONS\fR] [\fIFILE\fR...] +.sp +\fBtar\fR \fB\-x\fR [\fB\-f\fR \fIARCHIVE\fR] [\fIOPTIONS\fR] [\fIMEMBER\fR...] +.SS GNU-style usage +.sp +\fBtar\fR {\fB\-\-catenate\fR|\fB\-\-concatenate} [\fIOPTIONS\fR] \fIARCHIVE\fR \fIARCHIVE\fR +.sp +\fBtar\fR \fB\-\-create\fR [\fB\-\-file\fR \fIARCHIVE\fR] [\fIOPTIONS\fR] [\fIFILE\fR...] +.sp +\fBtar\fR {\fB\-\-diff\fR|\fB\-\-compare\fR} [\fB\-\-file\fR \fIARCHIVE\fR] [\fIOPTIONS\fR] [\fIFILE\fR...] +.sp +\fBtar\fR \fB\-\-delete\fR [\fB\-\-file\fR \fIARCHIVE\fR] [\fIOPTIONS\fR] [\fIMEMBER\fR...] +.sp +\fBtar\fR \fB\-\-append\fR [\fB\-f\fR \fIARCHIVE\fR] [\fIOPTIONS\fR] [\fIFILE\fR...] +.sp +\fBtar\fR \fB\-\-list\fR [\fB\-f\fR \fIARCHIVE\fR] [\fIOPTIONS\fR] [\fIMEMBER\fR...] +.sp +\fBtar\fR \fB\-\-test\-label\fR [\fB\-\-file\fR \fIARCHIVE\fR] [\fIOPTIONS\fR] [\fILABEL\fR...] +.sp +\fBtar\fR \fB\-\-update\fR [\fB\-\-file\fR \fIARCHIVE\fR] [\fIOPTIONS\fR] [\fIFILE\fR...] +.sp +\fBtar\fR \fB\-\-update\fR [\fB\-f\fR \fIARCHIVE\fR] [\fIOPTIONS\fR] [\fIFILE\fR...] +.sp +\fBtar\fR {\fB\-\-extract\fR|\fB\-\-get\fR} [\fB\-f\fR \fIARCHIVE\fR] [\fIOPTIONS\fR] [\fIMEMBER\fR...] +.SH NOTE +This manpage is a short description of GNU \fBtar\fR. For a detailed +discussion, including examples and usage recommendations, refer to the +\fBGNU Tar Manual\fR available in texinfo format. If the \fBinfo\fR +reader and the tar documentation are properly installed on your +system, the command +.PP +.RS +4 +.B info tar +.RE +.PP +should give you access to the complete manual. +.PP +You can also view the manual using the info mode in +.BR emacs (1), +or find it in various formats online at +.PP +.RS +4 +.B http://www.gnu.org/software/tar/manual +.RE +.PP +If any discrepancies occur between this manpage and the +\fBGNU Tar Manual\fR, the later shall be considered the authoritative +source. +.SH DESCRIPTION +GNU +.B tar +is an archiving program designed to store multiple files in a single +file (an \fBarchive\fR), and to manipulate such archives. The archive +can be either a regular file or a device (e.g. a tape drive, hence the name +of the program, which stands for \fBt\fRape \fBar\fRchiver), which can +be located either on the local or on a remote machine. +.PP + +.SS Option styles +Options to GNU \fBtar\fR can be given in three different styles. +In +.BR "traditional style" , +the first argument is a cluster of option letters and all subsequent +arguments supply arguments to those options that require them. The +arguments are read in the same order as the option letters. Any +command line words that remain after all options has been processed +are treated as non-optional arguments: file or archive member names. +.PP +For example, the \fBc\fR option requires creating the archive, the +\fBv\fR option requests the verbose operation, and the \fBf\fR option +takes an argument that sets the name of the archive to operate upon. +The following command, written in the traditional style, instructs tar +to store all files from the directory +.B /etc +into the archive file +.B etc.tar +verbosely listing the files being archived: +.PP +.EX +.B tar cfv a.tar /etc +.EE +.PP +In +.BR "UNIX " or " short-option style" , +each option letter is prefixed with a single dash, as in other command +line utilities. If an option takes argument, the argument follows it, +either as a separate command line word, or immediately following the +option. However, if the option takes an \fBoptional\fR argument, the +argument must follow the option letter without any intervening +whitespace, as in \fB\-g/tmp/snar.db\fR. +.PP +Any number of options not taking arguments can be +clustered together after a single dash, e.g. \fB\-vkp\fR. Options +that take arguments (whether mandatory or optional), can appear at +the end of such a cluster, e.g. \fB\-vkpf a.tar\fR. +.PP +The example command above written in the +.B short-option style +could look like: +.PP +.EX +.B tar -cvf a.tar /etc +or +.B tar -c -v -f a.tar /etc +.EE +.PP +In +.BR "GNU " or " long-option style" , +each option begins with two dashes and has a meaningful name, +consisting of lower-case letters and dashes. When used, the long +option can be abbreviated to its initial letters, provided that +this does not create ambiguity. Arguments to long options are +supplied either as a separate command line word, immediately following +the option, or separated from the option by an equals sign with no +intervening whitespace. Optional arguments must always use the latter +method. +.PP +Here are several ways of writing the example command in this style: +.PP +.EX +.B tar --create --file a.tar --verbose /etc +.EE +or (abbreviating some options): +.EX +.B tar --cre --file=a.tar --verb /etc +.EE +.PP +The options in all three styles can be intermixed, although doing so +with old options is not encouraged. +.SS Operation mode +The options listed in the table below tell GNU \fBtar\fR what +operation it is to perform. Exactly one of them must be given. +Meaning of non-optional arguments depends on the operation mode +requested. +.TP +\fB\-A\fR, \fB\-\-catenate\fR, \fB\-\-concatenate\fR +Append archive to the end of another archive. The arguments are +treated as the names of archives to append. All archives must be of +the same format as the archive they are appended to, otherwise the +resulting archive might be unusable with non-GNU implementations of +\fBtar\fR. Notice also that when more than one archive is given, the +members from archives other than the first one will be accessible in +the resulting archive only if using the \fB\-i\fR +(\fB\-\-ignore\-zeros) option. + +Compressed archives cannot be concatenated. +.TP +\fB\-c\fR, \fB\-\-create\fR +Create a new archive. Arguments supply the names of the files to be +archived. Directories are archived recursively, unless the +\fB\-\-no\-recursion\fR option is given. +.TP +\fB\-d\fR, \fB\-\-diff\fR, \fB\-\-compare\fR +Find differences between archive and file system. The arguments are +optional and specify archive members to compare. If not given, the +current working directory is assumed. +.TP +\fB\-\-delete\fR +Delete from the archive. The arguments supply names of the archive +members to be removed. At least one argument must be given. + +This option does not operate on compressed archives. There is no +short option equivalent. +.TP +\fB\-r\fR, \fB\-\-append\fR +Append files to the end of an archive. Arguments have the same +meaning as for \fB\-c\fR (\fB\-\-create). +.TP +\fB\-t\fR, \fB\-\-list\fR +List the contents of an archive. Arguments are optional. When given, +they specify the names of the members to list. +.TP +\fB\-\-test\-label +Test the archive volume label and exit. When used without arguments, +it prints the volume label (if any) and exits with status \fB0\fR. +When one or more command line arguments are given. +.B tar +compares the volume label with each argument. It exits with code +\fB0\fR if a match is found, and with code \fB1\fR otherwise. No +output is displayed, unless used together with the \fB\-v\fR +(\fB\-\-verbose\fR) option. + +There is no short option equivalent for this option. +.TP +\fB\-u\fR, \fB\-\-update\fR +Append files which are newer than the corresponding copy in the +archive. Arguments have the same meaning as with \fB\-c\fR and +\fB\-r\fR options. +.TP +\fB\-x\fR, \fB\-\-extract\fR, \fB\-\-get\fR +Extract files from an archive. Arguments are optional. When given, +they specify names of the archive members to be extracted. +.TP +.TP +\fB\-\-show\-defaults\fR +Show built-in defaults for various \fBtar\fR options and exit. No +arguments are allowed. +.TP +\fB\-?\fR, \fB\-\-help +Display a short option summary and exit. No arguments allowed. +.TP +\fB\-\-usage\fR +Display a list of available options and exit. No arguments allowed. +.TP +\fB\-\-version\fR +Print program version and copyright information and exit. +.SH OPTIONS +.SS Operation modifiers +.TP +\fB\-\-check\-device\fR +Check device numbers when creating incremental archives (default). +.TP +\fB\-g\fR, \fB\-\-listed\-incremental\fR=\fIFILE\fR +Handle new GNU-format incremental backups. \fIFILE\fR is the name of +a \fBsnapshot file\fR, where tar stores additional information which +is used to decide which files changed since the previous incremental +dump and, consequently, must be dumped again. If \fIFILE\fR does not +exist when creating an archive, it will be created and all files will +be added to the resulting archive (the \fBlevel 0\fR dump). To create +incremental archives of non-zero level \fBN\fR, create a copy of the +snapshot file created during the level \fBN-1\fR, and use it as +\fIFILE\fR. + +When listing or extracting, the actual contents of \fIFILE\fR is not +inspected, it is needed only due to syntactical requirements. It is +therefore common practice to use \fB/dev/null\fR in its place. +.TP +\fB\-G\fR, \fB\-\-incremental\fR +Handle old GNU-format incremental backups. +.TP +\fB\-\-ignore\-failed\-read\fR +Do not exit with nonzero on unreadable files. +.TP +\fB\-\-level\fR=\fINUMBER\fR +Set dump level for created listed-incremental archive. Currently only +\fB\-\-level=0\fR is meaningful: it instructs \fBtar\fR to truncate +the snapshot file before dumping, thereby forcing a level 0 dump. +.TP +\fB\-n\fR, \fB\-\-seek\fR +Assume the archive is seekable. Normally \fBtar\fR determines +automatically whether the archive can be seeked or not. This option +is intended for use in cases when such recognition fails. It takes +effect only if the archive is open for reading (e.g. with +.B \-\-list +or +.B \-\-extract +options). +.TP +\fB\-\-no\-check\-device\fR +Do not check device numbers when creating incremental archives. +.TP +\fB\-\-no\-seek\fR +Assume the archive is not seekable. +.TP +\fB\-\-occurrence\fR[=\fIN\fR] +Process only the \fIN\fRth occurrence of each file in the +archive. This option is valid only when used with one of the +following subcommands: \fB\-\-delete\fR, \fB\-\-diff\fR, +\fB\-\-extract\fR or \fB\-\-list\fR and when a list of files is given +either on the command line or via the \fB\-\fRT option. The default +\fIN\fR is \fB1\fR. +.TP +\fB\-\-restrict\fR +Disable the use of some potentially harmful options. +.TP +\fB\-\-sparse\-version\fR=\fIMAJOR\fR[.\fIMINOR\fR] +Set version of the sparse format to use (implies \fB\-\-sparse\fR). +This option implies +.BR \-\-sparse . +Valid argument values are +.BR 0.0 , +.BR 0.1 ", and" +.BR 1.0 . +For a detailed discussion of sparse formats, refer to the \fBGNU Tar +Manual\fR, appendix \fBD\fR, "\fBSparse Formats\fR". Using \fBinfo\fR +reader, it can be accessed running the following command: +.BR "info tar 'Sparse Formats'" . +.TP +\fB\-S\fR, \fB\-\-sparse\fR +Handle sparse files efficiently. Some files in the file system may +have segments which were actually never written (quite often these are +database files created by such systems as \fBDBM\fR). When given this +option, \fBtar\fR attempts to determine if the file is sparse prior to +archiving it, and if so, to reduce the resulting archive size by not +dumping empty parts of the file. +.SS Overwrite control +These options control \fBtar\fR actions when extracting a file over +an existing copy on disk. +.TP +\fB\-k\fR, \fB\-\-keep\-old\-files\fR +Don't replace existing files when extracting. +.TP +\fB\-\-keep\-newer\-files\fR +Don't replace existing files that are newer than their archive copies. +.TP +\fB\-\-no\-overwrite\-dir\fR +Preserve metadata of existing directories. +.TP +\fB\-\-one\-top\-level\fR[\fB=\fIDIR\fR] +Extract all files into \fIDIR\fR, or, if used without argument, into a +subdirectory named by the base name of the archive (minus standard +compression suffixes recognizable by \fB\-\-auto\-compress). +.TP +\fB\-\-overwrite\fR +Overwrite existing files when extracting. +.TP +\fB\-\-overwrite\-dir\fR +Overwrite metadata of existing directories when extracting (default). +.TP +\fB\-\-recursive\-unlink\fR +Recursively remove all files in the directory prior to extracting it. +.TP +\fB\-\-remove\-files\fR +Remove files from disk after adding them to the archive. +.TP +\fB\-U\fR, \fB\-\-unlink\-first\fR +Remove each file prior to extracting over it. +.TP +\fB\-W\fR, \fB\-\-verify\fR +Verify the archive after writing it. +.SS Output stream selection +.TP +\fB\-\-ignore\-command\-error\fR +.TP +Ignore subprocess exit codes. +.TP +\fB\-\-no\-ignore\-command\-error\fR +Treat non-zero exit codes of children as error (default). +.TP +\fB\-O\fR, \fB\-\-to\-stdout\fR +Extract files to standard output. +.TP +\fB\-\-to\-command\fR=\fICOMMAND\fR +Pipe extracted files to \fICOMMAND\fR. The argument is the pathname +of an external program, optionally with command line arguments. The +program will be invoked and the contents of the file being extracted +supplied to it on its standard output. Additional data will be +supplied via the following environment variables: +.RS +.TP +.B TAR_FILETYPE +Type of the file. It is a single letter with the following meaning: +.sp +.nf +.ta 8n 20n + f Regular file + d Directory + l Symbolic link + h Hard link + b Block device + c Character device +.fi + +Currently only regular files are supported. +.TP +.B TAR_MODE +File mode, an octal number. +.TP +.B TAR_FILENAME +The name of the file. +.TP +.B TAR_REALNAME +Name of the file as stored in the archive. +.TP +.B TAR_UNAME +Name of the file owner. +.TP +.B TAR_GNAME +Name of the file owner group. +.TP +.B TAR_ATIME +Time of last access. It is a decimal number, representing seconds +since the Epoch. If the archive provides times with nanosecond +precision, the nanoseconds are appended to the timestamp after a +decimal point. +.TP +.B TAR_MTIME +Time of last modification. +.TP +.B TAR_CTIME +Time of last status change. +.TP +.B TAR_SIZE +Size of the file. +.TP +.B TAR_UID +UID of the file owner. +.TP +.B TAR_GID +GID of the file owner. +.RE +.RS + +Additionally, the following variables contain information about +\fBtar\fR operation mode and the archive being processed: +.TP +.B TAR_VERSION +GNU \fBtar\fR version number. +.TP +.B TAR_ARCHIVE +The name of the archive \fBtar\fR is processing. +.TP +.B TAR_BLOCKING_FACTOR +Current blocking factor, i.e. number of 512-byte blocks in a record. +.TP +.B TAR_VOLUME +Ordinal number of the volume \fBtar\fR is processing (set if +reading a multi-volume archive). +.TP +.B TAR_FORMAT +Format of the archive being processed. One of: +.BR gnu , +.BR oldgnu , +.BR posix , +.BR ustar , +.BR v7 . +.B TAR_SUBCOMMAND +A short option (with a leading dash) describing the operation \fBtar\fR is +executing. +.RE +.SS Handling of file attributes +.TP +\fB\-\-atime\-preserve\fR[=\fIMETHOD\fR] +Preserve access times on dumped files, either by restoring the times +after reading (\fIMETHOD\fR=\fBreplace\fR, this is the default) or by +not setting the times in the first place (\fIMETHOD\fR=\fBsystem\fR) +.TP +\fB\-\-delay\-directory\-restore\fR +Delay setting modification times and permissions of extracted +directories until the end of extraction. Use this option when +extracting from an archive which has unusual member ordering. +.TP +\fB\-\-group\fR=\fINAME\fR +Force \fINAME\fR as group for added files. +.TP +\fB\-\-mode\fR=\fICHANGES\fR +Force symbolic mode \fICHANGES\fR for added files. +.TP +\fB\-\-mtime\fR=\fIDATE-OR-FILE\fR +Set mtime for added files. \fIDATE-OR-FILE\fR is either a date/time +in almost arbitrary formate, or the name of an existing file. In the +latter case the mtime of that file will be used. +.TP +\fB\-m\fR, \fB\-\-touch\fR +Don't extract file modified time. +.TP +\fB\-\-no\-delay\-directory\-restore\fR +Cancel the effect of the prior \fB\-\-delay\-directory\-restore\fR option. +.TP +\fB\-\-no\-same\-owner\fR +Extract files as yourself (default for ordinary users). +.TP +\fB\-\-no\-same\-permissions\fR +Apply the user's umask when extracting permissions from the archive +(default for ordinary users). +.TP +\fB\-\-numeric\-owner\fR +Always use numbers for user/group names. +.TP +\fB\-\-owner\fR=\fINAME\fR +Force \fINAME\fR as owner for added files. +.TP +\fB\-p\fR, \fB\-\-preserve\-permissions\fR, \fB\-\-same\-permissions\fR +extract information about file permissions (default for superuser) +.TP +\fB\-\-preserve\fR +Same as both \fB\-p\fR and \fB\-s\fR. +.TP +\fB\-\-same\-owner\fR +Try extracting files with the same ownership as exists in the archive +(default for superuser). +.TP +\fB\-s\fR, \fB\-\-preserve\-order\fR, \fB\-\-same\-order\fR +Sort names to extract to match archive +.TP +\fB\-\-sort=\fIORDER\fR +When creating an archive, sort directory entries according to +\fIORDER\fR, which is one of +.BR none , +.BR name ", or" +.BR inode . + +The default is \fB\-\-sort=none\fR, which stores archive members in +the same order as returned by the operating system. + +Using \fB\-\-sort=name\fR ensures the member ordering in the created archive +is uniform and reproducible. + +Using \fB\-\-sort=inode\fR reduces the number of disk seeks made when +creating the archive and thus can considerably speed up archivation. +This sorting order is supported only if the underlying system provides +the necessary information. +.SS Device selection and switching +.TP +\fB\-f\fR, \fB\-\-file\fR=\fIARCHIVE\fR +Use archive file or device \fIARCHIVE\fR. If this option is not +given, \fBtar\fR will first examine the environment variable `TAPE'. +If it is set, its value will be used as the archive name. Otherwise, +\fBtar\fR will assume the compiled-in default. The default +value can be inspected either using the +.B \-\-show\-defaults +option, or at the end of the \fBtar \-\-help\fR output. + +An archive name that has a colon in it specifies a file or device on a +remote machine. The part before the colon is taken as the machine +name or IP address, and the part after it as the file or device +pathname, e.g.: + +.EX +--file=remotehost:/dev/sr0 +.EE + +An optional username can be prefixed to the hostname, placing a \fB@\fR +sign between them. + +By default, the remote host is accessed via the +.BR rsh (1) +command. Nowadays it is common to use +.BR ssh (1) +instead. You can do so by giving the following command line option: + +.EX +--rsh-command=/usr/bin/ssh +.EE + +The remote mashine should have the +.BR rmt (8) +command installed. If its pathname does not match \fBtar\fR's +default, you can inform \fBtar\fR about the correct pathname using the +.B \-\-rmt\-command +option. +.TP +\fB\-\-force\-local\fR +Archive file is local even if it has a colon. +.TP +\fB\-\fRF, \fB\-\-info\-script\fR=\fICOMMAND\fR, \fB\-\-new\-volume\-script\fR=\fICOMMAND\fR +Run \fICOMMAND\fR at the end of each tape (implies \fB\-M\fR). The +command can include arguments. When started, it will inherit \fBtar\fR's +environment plus the following variables: +.RS +.TP +.B TAR_VERSION +GNU \fBtar\fR version number. +.TP +.B TAR_ARCHIVE +The name of the archive \fBtar\fR is processing. +.TP +.B TAR_BLOCKING_FACTOR +Current blocking factor, i.e. number of 512-byte blocks in a record. +.TP +.B TAR_VOLUME +Ordinal number of the volume \fBtar\fR is processing (set if +reading a multi-volume archive). +.TP +.B TAR_FORMAT +Format of the archive being processed. One of: +.BR gnu , +.BR oldgnu , +.BR posix , +.BR ustar , +.BR v7 . +.TP +.B TAR_SUBCOMMAND +A short option (with a leading dash) describing the operation \fBtar\fR is +executing. +.TP +.B TAR_FD +File descriptor which can be used to communicate the new volume name +to +.BR tar . +.RE +.RS + +If the info script fails, \fBtar\fR exits; otherwise, it begins writing +the next volume. +.RE +.TP +\fB\-L\fR, \fB\-\-tape\-length\fR=\fN\fR +Change tape after writing \fIN\fRx1024 bytes. If \fIN\fR is followed +by a size suffix (see the subsection +.B Size suffixes +below), the suffix specifies the multiplicative factor to be used +instead of 1024. + +This option implies +.BR \-M . +.TP +\fB\-M\fR, \fB\-\-multi\-volume\fR +Create/list/extract multi-volume archive. +.TP +\fB\-\-rmt\-command\fR=\fICOMMAND\fR +Use \fICOMMAND\fR instead of \fBrmt\fR when accessing remote +archives. See the description of the +.B \-f +option, above. +.TP +\fB\-\-rsh\-command\fR=\fICOMMAND\fR +Use \fICOMMAND\fR instead of \fBrsh\fR when accessing remote +archives. See the description of the +.B \-f +option, above. +.TP +\fB\-\-volno\-file\fR=\fIFILE\fR +When this option is used in conjunction with +.BR \-\-multi\-volume , +.B tar +will keep track of which volume of a multi-volume archive it is +working in \fIFILE\fR. +.SS Device blocking +.TP +\fB\-b\fR, \fB\-\-blocking\-factor\fR=\fIBLOCKS\fR +Set record size to \fIBLOCKS\fRx\fB512\fR bytes. +.TP +\fB\-B\fR, \fB\-\-read\-full\-records\fR +When listing or extracting, accept incomplete input records after +end-of-file marker. +.TP +\fB\-i\fR, \fB\-\-ignore\-zeros\fR +Ignore zeroed blocks in archive. Normally two consecutive 512-blocks +filled with zeroes mean EOF and tar stops reading after encountering +them. This option instructs it to read further and is useful when +reading archives created with the \fB\-A\fR option. +.TP +\fB\-\-record\-size\fR=\fINUMBER\fR +Set record size. \fINUMBER\fR is the number of bytes per record. It +must be multiple of \fB512\fR. It can can be suffixed with a \fBsize +suffix\fR, e.g. \fB\-\-record-size=10K\fR, for 10 Kilobytes. See the +subsection +.BR "Size suffixes" , +for a list of valid suffixes. +.SS Archive format selection +.TP +\fB\-H\fR, \fB\-\-format\fR=\fIFORMAT\fR +Create archive of the given format. Valid formats are: +.RS +.TP +.B gnu +GNU tar 1.13.x format +.TP +.B oldgnu +GNU format as per tar <= 1.12. +.TP +\fBpax\fR, \fBposix\fR +POSIX 1003.1-2001 (pax) format. +.TP +.B ustar +POSIX 1003.1-1988 (ustar) format. +.TP +.B v7 +Old V7 tar format. +.RE +.TP +\fB\-\-old\-archive\fR, \fB\-\-portability\fR +Same as \fB\-\-format=v7\fR. +.TP +\fB\-\-pax\-option\fR=\fIkeyword\fR[[:]=\fIvalue\fR][,\fIkeyword\fR[[:]=\fIvalue\fR]]... +Control pax keywords when creating \fBPAX\fR archives (\fB\-H +pax\fR). This option is equivalent to the \fB\-o\fR option of the +.BR pax (1) utility. +.TP +\fB\-\-posix\fR +Same as \fB\-\-format=posix\fR. +.TP +\fB\-V\fR, \fB\-\-label\fR=\fITEXT\fR +Create archive with volume name \fITEXT\fR. If listing or extracting, +use \fITEXT\fR as a globbing pattern for volume name. +.SS Compression options +.TP +\fB\-a\fR, \fB\-\-auto\-compress\fR +Use archive suffix to determine the compression program. +.TP +\fB\-\fRI, \fB\-\-use\-compress\-program\fI=\fICOMMAND\fR +Filter data through \fICOMMAND\fR. It must accept the \fB\-d\fR +option, for decompression. The argument can contain command line +options. +.TP +\fB\-j\fR, \fB\-\-bzip2\fR +Filter the archive through +.BR bzip2 (1). +.TP +\fB\-J\fR, \fB\-\-xz\fR +Filter the archive through +.BR xz (1). +.TP +\fB\-\-lzip\fR +Filter the archive through +.BR lzip (1). +.TP +\fB\-\-lzma\fR +Filter the archive through +.BR lzma (1). +.TP +\fB\-\-lzop\fR +Filter the archive through +.BR lzop (1). +.TP +\fB\-\-no\-auto\-compress\fR +Do not use archive suffix to determine the compression program. +.TP +\fB\-z\fR, \fB\-\-gzip\fR, \fB\-\-gunzip\fR, \fB\-\-ungzip\fR +Filter the archive through +.BR gzip (1). +.TP +\fB\-\fRZ, \fB\-\-compress\fR, \fB\-\-uncompress\fR +Filter the archive through +.BR compress (1). +.SS Local file selection +.TP +\fB\-\-add\-file\fR=\fIFILE\fR +Add \fIFILE\fR to the archive (useful if its name starts with a dash). +.TP +\fB\-\-backup\fR[=\fICONTROL\fR] +Backup before removal. The \fICONTROL\fR argument, if supplied, +controls the backup policy. Its valid values are: +.RS +.TP +.BR none ", " off +Never make backups. +.TP +.BR t ", " numbered +Make numbered backups. +.TP +.BR nil ", " existing +Make numbered backups if numbered backups exist, simple backups otherwise. +.TP +.BR never ", " simple +Always make simple backups +.RS +.RE + +If \fICONTROL\fR is not given, the value is taken from the +.B VERSION_CONTROL +environment variable. If it is not set, \fBexisting\fR is assumed. +.RE +.TP +\fB\-C\fR, \fB\-\-directory\fR=\fIDIR\fR +Change to directory DIR. +.TP +\fB\-\-exclude\fR=\fIPATTERN\fR +Exclude files matching \fIPATTERN\fR, a +.BR glob (3)-style +wildcard pattern. +.TP +\fB\-\-exclude\-backups\fR +Exclude backup and lock files. +.TP +\fB\-\-exclude\-caches\fR +Exclude contents of directories containing file \fBCACHEDIR.TAG\fR, +except for the tag file itself. +.TP +\fB\-\-exclude\-caches\-all\fR +Exclude directories containing file \fBCACHEDIR.TAG\fR and the file itself. +.TP +\fB\-\-exclude\-caches\-under\fR +Exclude everything under directories containing \fBCACHEDIR.TAG\fR +.TP +\fB\-\-exclude\-ignore=\fIFILE\fR +Before dumping a directory, see if it contains \fIFILE\fR. +If so, read exclusion patterns from this file. The patterns affect +only the directory itself. +.TP +\fB\-\-exclude\-ignore\-recursive=\fIFILE\fR +Same as \fB\-\-exclude\-ignore\fR, except that patterns from +\fIFILE\fR affect both the directory and all its subdirectories. +.TP +\fB\-\-exclude\-tag\fR=\fIFILE\fR +Exclude contents of directories containing \fIFILE\fR, except for +\fIFILE\fR itself. +.TP +\fB\-\-exclude\-tag\-all\fR=\fIFILE\fR +Exclude directories containing \fIFILE\fR. +.TP +\fB\-\-exclude\-tag\-under\fR=\fIFILE\fR +Exclude everything under directories containing \fIFILE\fR. +.TP +\fB\-\-exclude\-vcs\fR +Exclude version control system directories. +.TP +\fB\-\-exclude\-vcs\-ignores\fR +Exclude files that match patterns read from VCS-specific ignore +files. Supported files are: +.BR .cvsignore , +.BR .gitignore , +.BR .bzrignore ", and" +.BR .hgignore . +.TP +\fB\-h\fR, \fB\-\-dereference\fR +Follow symlinks; archive and dump the files they point to. +.TP +\fB\-\-hard\-dereference\fR +Follow hard links; archive and dump the files they refer to. +.TP +\fB\-K\fR, \fB\-\-starting\-file\fR=\fIMEMBER\fR +Begin at the given member in the archive. +.TP +\fB\-\-newer\-mtime\fR=\fIDATE\fR +Work on files whose data changed after the \fIDATE\fR. If \fIDATE\fR +starts with \fB/\fR or \fB.\fR it is taken to be a file name; the +mtime of that file is used as the date. +.TP +\fB\-\-no\-null\fR +Disable the effect of the previous \fB\-\-null\fR option. +.TP +\fB\-\-no\-recursion\fR +Avoid descending automatically in directories. +.TP +\fB\-\-no\-unquote\fR +Do not unquote input file or member names. +.TP +\fB\-\-null\fR +Instruct subsequent \fB\-T\fR options to read null-terminated names, +disable handling of the \fB\-C\fR option read from the file. +.TP +\fB\-N\fR, \fB\-\-newer\fR=\fIDATE\fR, \fB\-\-after\-date\fR=\fIDATE\fR +Only store files newer than DATE. If \fIDATE\fR starts with \fB/\fR +or \fB.\fR it is taken to be a file name; the ctime of that file is +used as the date. +.TP +\fB\-\-one\-file\-system\fR +Stay in local file system when creating archive. +.TP +\fB\-P\fR, \fB\-\-absolute\-names\fR +Don't strip leading slashes from file names when creating archives. +.TP +\fB\-\-recursion\fR +Recurse into directories (default). +.TP +\fB\-\-suffix\fR=\fISTRING\fR +Backup before removal, override usual suffix. Default suffix is \fB~\fR, +unless overridden by environment variable \fBSIMPLE_BACKUP_SUFFIX\fR. +.TP +\fB\-T\fR, \fB\-\-files\-from\fR=\fIFILE\fR +Get names to extract or create from \fIFILE\fR. +.TP +\fB\-\-unquote\fR +Unquote file or member names (default). +.TP +\fB\-X\fR, \fB\-\-exclude\-from\fR=\fIFILE\fR +Exclude files matching patterns listed in FILE. +.SS File name transformations +.TP +\fB\-\-strip\-components\fR=\fINUMBER\fR +Strip \fINUMBER\fR leading components from file names on extraction. +.TP +\fB\-\-transform\fR=\fIEXPRESSION\dR, \fB\-\-xform\fR=\fIEXPRESSION\fR +Use sed replace \fIEXPRESSION\fR to transform file names. +.SS File name matching options +These options affect both exclude and include patterns. +.TP +\fB\-\-anchored\fR +Patterns match file name start. +.TP +\fB\-\-ignore\-case\fR +Ignore case. +.TP +\fB\-\-no\-anchored\fR +Patterns match after any \fB/\fR (default for exclusion). +.TP +\fB\-\-no\-ignore\-case\fR +Case sensitive matching (default). +.TP +\fB\-\-no\-wildcards\fR +Verbatim string matching. +.TP +\fB\-\-no\-wildcards\-match\-slash\fR +Wildcards do not match \fB/\fR. +.TP +\fB\-\-wildcards\fR +Use wildcards (default for exclusion). +.TP +\fB\-\-wildcards\-match\-slash\fR +Wildcards match \fB/\fR (default for exclusion). +.SS Informative output +.TP +\fB\-\-checkpoint\fR[=\fIN\fR] +Display progress messages every \fIN\fRth record (default 10). +.TP +\fB\-\-checkpoint\-action\fR=\fIACTION\fR +Run \fIACTION\fR on each checkpoint. +.TP +\fB\-\-full\-time\fR +Print file time to its full resolution. +.TP +\fB\-\-index\-file\fR=\fIFILE\fR +Send verbose output to \fIFILE\fR. +.TP +\fB\-l\fR, \fB\-\-check\-links\fR +Print a message if not all links are dumped. +.TP +\fB\-\-no\-quote\-chars\fR=\fISTRING\fR +Disable quoting for characters from \fISTRING\fR. +.TP +\fB\-\-quote\-chars\fR=\fISTRING\fR +Additionally quote characters from \fISTRING\fR. +.TP +\fB\-\-quoting\-style\fR=\fISTYLE\fR +Set quoting style for file and member names. Valid values for +\fISTYLE\fR are +.BR literal , +.BR shell , +.BR shell-always , +.BR c , +.BR c-maybe , +.BR escape , +.BR locale , +.BR clocale . +.TP +\fB\-R\fR, \fB\-\-block\-number\fR +Show block number within archive with each message. +.TP +\fB\-\-show\-omitted\-dirs\fR +When listing or extracting, list each directory that does not match +search criteria. +.TP +\fB\-\-show\-transformed\-names\fR, \fB\-\-show\-stored\-names\fR +Show file or archive names after transformation by \fB\-\-strip\fR and +\fB\-\-transform\fR options. +.TP +\fB\-\-totals\fR[=\fISIGNAL\fR] +Print total bytes after processing the archive. If \fISIGNAL\fR is +given, print total bytes when this signal is delivered. Allowed +signals are: +.BR SIGHUP , +.BR SIGQUIT , +.BR SIGINT , +.BR SIGUSR1 ", and" +.BR SIGUSR2 . +The \fBSIG\fR prefix can be omitted. +.TP +\fB\-\-utc\fR +Print file modification times in UTC. +.TP +\fB\-v\fR, \fB\-\-verbose\fR +Verbosely list files processed. +.TP +\fB\-\-warning\fR=\fIKEYWORD\fR +Enable or disable warning messages identified by \fIKEYWORD\fR. The +messages are suppressed if \fIKEYWORD\fR is prefixed with \fBno\-\fR +and enabled otherwise. + +Multiple \fB\-\-warning\fR messages accumulate. + +Keywords controlling general \fBtar\fR operation: +.RS +.TP +.B all +Enable all warning messages. This is the default. +.TP +.B none +Disable all warning messages. +.TP +.B filename-with-nuls +"%s: file name read contains nul character" +.TP +.B alone-zero-block +"A lone zero block at %s" +.HP +Keywords applicable for \fBtar --create\fR: +.TP +.B cachedir +"%s: contains a cache directory tag %s; %s" +.TP +.B file-shrank +"%s: File shrank by %s bytes; padding with zeros" +.TP +.B xdev +"%s: file is on a different filesystem; not dumped" +.TP +.B file-ignored +"%s: Unknown file type; file ignored" +.br +"%s: socket ignored" +.br +"%s: door ignored" +.TP +.B file-unchanged +"%s: file is unchanged; not dumped" +.TP +.B ignore-archive +"%s: file is the archive; not dumped" +.TP +.B file-removed +"%s: File removed before we read it" +.TP +.B file-changed +"%s: file changed as we read it" +.HP +Keywords applicable for \fBtar --extract\fR: +.TP +.B timestamp +"%s: implausibly old time stamp %s" +.br +"%s: time stamp %s is %s s in the future" +.TP +.B contiguous-cast +"Extracting contiguous files as regular files" +.TP +.B symlink-cast +"Attempting extraction of symbolic links as hard links" +.TP +.B unknown-cast +"%s: Unknown file type '%c', extracted as normal file" +.TP +.B ignore-newer +"Current %s is newer or same age" +.TP +.B unknown-keyword +"Ignoring unknown extended header keyword '%s'" +.TP +.B decompress-program +Controls verbose description of failures occurring when trying to run +alternative decompressor programs. This warning is disabled by +default (unless \fB\-\-verbose\fR is used). A common example of what +you can get when using this warning is: + +.EX +$ \fBtar --warning=decompress-program -x -f archive.Z +tar (child): cannot run compress: No such file or directory +tar (child): trying gzip +.EE + +This means that \fBtar\fR first tried to decompress +\fBarchive.Z\fR using \fBcompress\fR, and, when that +failed, switched to \fBgzip\fR. +.TP +.B record-size +"Record size = %lu blocks" +.HP +Keywords controlling incremental extraction: +.TP +.B rename-directory +"%s: Directory has been renamed from %s" +.br +"%s: Directory has been renamed" +.TP +.B new-directory +"%s: Directory is new" +.TP +.B xdev +"%s: directory is on a different device: not purging" +.TP +.B bad-dumpdir +"Malformed dumpdir: 'X' never used" +.RE +.TP +\fB\-w\fR, \fB\-\-interactive\fR, \fB\-\-confirmation\fR +Ask for confirmation for every action. +.SS Compatibility options +.TP +\fB\-o\fR +When creating, same as \fB\-\-old\-archive\fR. When extracting, same +as \fB\-\-no\-same\-owner\fR. +.SS Size suffixes +.sp +.nf +.ta 8n 18n 42n +.ul + Suffix Units Byte Equivalent + b Blocks \fISIZE\fR x 512 + B Kilobytes \fISIZE\fR x 1024 + c Bytes \fISIZE\fR + G Gigabytes \fISIZE\fR x 1024^3 + K Kilobytes \fISIZE\fR x 1024 + k Kilobytes \fISIZE\fR x 1024 + M Megabytes \fISIZE\fR x 1024^2 + P Petabytes \fISIZE\fR x 1024^5 + T Terabytes \fISIZE\fR x 1024^4 + w Words \fISIZE\fR x 2 +.fi +.PP +.SH "RETURN VALUE" +Tar exit code indicates whether it was able to successfully perform +the requested operation, and if not, what kind of error occurred. +.TP +.B 0 +Successful termination. +.TP +.B 1 +.I Some files differ. +If tar was invoked with the \fB\-\-compare\fR (\fB\-\-diff\fR, \fB\-d\fR) +command line option, this means that some files in the archive differ +from their disk counterparts. If tar was given one of the \fB\-\-create\fR, +\fB\-\-append\fR or \fB\-\-update\fR options, this exit code means +that some files were changed while being archived and so the resulting +archive does not contain the exact copy of the file set. +.TP +.B 2 +.I Fatal error. +This means that some fatal, unrecoverable error occurred. +.PP +If a subprocess that had been invoked by +.B tar +exited with a nonzero exit code, +.B tar +itself exits with that code as well. This can happen, for example, if +a compression option (e.g. \fB\-z\fR) was used and the external +compressor program failed. Another example is +.B rmt +failure during backup to a remote device. +.SH "SEE ALSO" +.BR bzip2 (1), +.BR compress (1), +.BR gzip (1), +.BR lzma (1), +.BR lzop (1), +.BR rmt (8), +.BR symlink (7), +.BR tar (5), +.BR xz (1). +.PP +Complete \fBtar\fR manual: run +.B info tar +or use +.BR emacs (1) +info mode to read it. +.PP +Online copies of \fBGNU tar\fR documentation in various formats can be +found at: +.PP +.in +4 +.B http://www.gnu.org/software/tar/manual +.SH "BUG REPORTS" +Report bugs to . +.SH COPYRIGHT +Copyright \(co 2013 Free Software Foundation, Inc. +.br +.na +License GPLv3+: GNU GPL version 3 or later +.br +.ad +This is free software: you are free to change and redistribute it. +There is NO WARRANTY, to the extent permitted by law. +.\" Local variables: +.\" eval: (add-hook 'write-file-hooks 'time-stamp) +.\" time-stamp-start: ".TH [A-Z_][A-Z0-9_.\\-]* [0-9] \"" +.\" time-stamp-format: "%:B %:d, %:y" +.\" time-stamp-end: "\"" +.\" time-stamp-line-limit: 20 +.\" end: + diff --git a/doc/tar.info b/doc/tar.info index 06ccdaa..9dfe69d 100644 --- a/doc/tar.info +++ b/doc/tar.info @@ -1,6 +1,6 @@ This is tar.info, produced by makeinfo version 4.13 from tar.texi. -This manual is for GNU `tar' (version 1.27, 24 September 2013), which +This manual is for GNU `tar' (version 1.28, 22 July 2014), which creates and extracts files from archives. Copyright (C) 1992, 1994-1997, 1999-2001, 2003-2013 Free Software @@ -30,411 +30,420 @@ END-INFO-DIR-ENTRY  Indirect: -tar.info-1: 1146 -tar.info-2: 298426 -tar.info-3: 562228 +tar.info-1: 1141 +tar.info-2: 299746 +tar.info-3: 569473  Tag Table: (Indirect) -Node: Top1146 -Node: Introduction10453 -Node: Book Contents11240 -Node: Definitions13412 -Node: What tar Does15215 -Node: Naming tar Archives17981 -Node: Authors18701 -Node: Reports20514 -Node: Tutorial20871 -Node: assumptions21684 -Node: stylistic conventions24159 -Node: basic tar options24602 -Node: frequent operations28240 -Node: Two Frequent Options28892 -Node: file tutorial29523 -Node: verbose tutorial30880 -Ref: verbose member listing33094 -Node: help tutorial35854 -Node: create36208 -Node: prepare for examples37709 -Node: Creating the archive39478 -Node: create verbose42310 -Node: short create43130 -Node: create dir45883 -Node: list48591 -Ref: listing member and file names49870 -Node: list dir52184 -Node: extract53196 -Node: extracting archives54310 -Node: extracting files54815 -Ref: extracting files-Footnote-157462 -Node: extract dir57842 -Node: extracting untrusted archives60235 -Node: failing commands61114 -Node: going further62208 -Node: tar invocation62421 -Node: Synopsis64201 -Ref: exit status67522 -Node: using tar options69156 -Ref: TAR_OPTIONS70733 -Node: Styles71750 -Ref: Styles-Footnote-173249 -Node: Long Options73505 -Node: Short Options75677 -Ref: Short Options-Footnote-177485 -Node: Old Options77702 -Node: Mixing80465 -Ref: Mixing-Footnote-182831 -Node: All Options82951 -Node: Operation Summary83556 -Ref: --append83676 -Ref: --catenate83756 -Ref: --compare83827 -Ref: --concatenate84030 -Ref: --create84140 -Ref: --delete84208 -Ref: --diff84322 -Ref: --extract84378 -Ref: --get84480 -Ref: --list84538 -Ref: --update84606 -Node: Option Summary84816 -Ref: --absolute-names84971 -Ref: --after-date85261 -Ref: --anchored85313 -Ref: --atime-preserve85446 -Ref: --auto-compress87966 -Ref: --backup88193 -Ref: --block-number88384 -Ref: --blocking-factor88558 -Ref: --bzip288710 -Ref: --check-device88817 -Ref: --checkpoint89012 -Ref: --checkpoint-action89454 -Ref: --check-links90605 -Ref: --compress90882 -Ref: --uncompress90882 -Ref: --confirmation91086 -Ref: --delay-directory-restore91154 -Ref: --dereference91355 -Ref: --directory91549 -Ref: --exclude91802 -Ref: --exclude-backups91921 -Ref: --exclude-from92011 -Ref: --exclude-caches92157 -Ref: --exclude-caches-under92365 -Ref: --exclude-caches-all92543 -Ref: --exclude-tag92672 -Ref: --exclude-tag-under92843 -Ref: --exclude-tag-all93033 -Ref: --exclude-vcs93162 -Ref: --file93328 -Ref: --files-from93528 -Ref: --force-local93731 -Ref: --format93922 -Ref: --full-time94592 -Ref: --group95272 -Ref: --gzip95568 -Ref: --gunzip95568 -Ref: --ungzip95568 -Ref: --hard-dereference95791 -Ref: --help95978 -Ref: --ignore-case96112 -Ref: --ignore-command-error96239 -Ref: --ignore-failed-read96350 -Ref: --ignore-zeros96491 -Ref: --incremental96636 -Ref: --index-file96901 -Ref: --info-script96986 -Ref: --new-volume-script96986 -Ref: --interactive97283 -Ref: ----keep-directory-symlink97495 -Ref: --keep-newer-files98043 -Ref: --keep-old-files98185 -Ref: --label98397 -Ref: --level98685 -Ref: --listed-incremental99126 -Ref: --lzip99490 -Ref: --lzma99590 -Ref: --mode99790 -Ref: --mtime100081 -Ref: --multi-volume100522 -Ref: --newer100726 -Ref: --newer-mtime101004 -Ref: --no-anchored101228 -Ref: --no-auto-compress101365 -Ref: --no-check-device101516 -Ref: --no-delay-directory-restore101699 -Ref: --no-ignore-case101952 -Ref: --no-ignore-command-error102045 -Ref: --no-null102200 -Ref: --no-overwrite-dir102405 -Ref: --no-quote-chars102548 -Ref: --no-recursion102729 -Ref: --no-same-owner102834 -Ref: --no-same-permissions103017 -Ref: --no-seek103219 -Ref: --no-unquote103437 -Ref: --no-wildcards103575 -Ref: --no-wildcards-match-slash103659 -Ref: --null103761 -Ref: --numeric-owner103989 -Ref: --occurrence104640 -Ref: --old-archive105207 -Ref: --one-file-system105256 -Ref: --overwrite105434 -Ref: --overwrite-dir105576 -Ref: --owner105721 -Ref: --pax-option106046 -Ref: --portability106353 -Ref: --posix106418 -Ref: --preserve106460 -Ref: --preserve-order106598 -Ref: --preserve-permissions106662 -Ref: --same-permissions106662 -Ref: --quote-chars107076 -Ref: --quoting-style107229 -Ref: --read-full-records107550 -Ref: --record-size107715 -Ref: --recursion108059 -Ref: --recursive-unlink108162 -Ref: --remove-files108329 -Ref: --restrict108475 -Ref: --rmt-command108663 -Ref: --rsh-command108804 -Ref: --same-order108926 -Ref: --same-owner109218 -Ref: --seek109595 -Ref: --show-defaults109964 -Ref: --show-omitted-dirs110472 -Ref: --show-snapshot-field-ranges110626 -Ref: --show-transformed-names110822 -Ref: --show-stored-names110822 -Ref: --skip-old-files111211 -Ref: --sparse111661 -Ref: --sparse-version111800 -Ref: --starting-file112024 -Ref: --strip-components112213 -Ref: --suffix112525 -Ref: --tape-length112644 -Ref: --test-label113059 -Ref: --to-command113211 -Ref: --to-stdout113370 -Ref: --totals113523 -Ref: --touch113754 -Ref: --transform113956 -Ref: --xform113956 -Ref: --unlink-first114567 -Ref: --unquote114735 -Ref: --use-compress-program114842 -Ref: --utc115020 -Ref: --verbose115113 -Ref: --verify115365 -Ref: --version115483 -Ref: --volno-file115655 -Ref: --warning115842 -Ref: --wildcards116019 -Ref: --wildcards-match-slash116139 -Ref: --xz116231 -Ref: Option Summary-Footnote-1116362 -Node: Short Option Summary116580 -Node: help118781 -Ref: help-Footnote-1122610 -Node: defaults122821 -Node: verbose123840 -Ref: totals126141 -Ref: Progress information127731 -Ref: show-omitted-dirs128710 -Ref: block-number129129 -Ref: verbose-Footnote-1130156 -Node: checkpoints130263 -Ref: checkpoint exec134138 -Node: warnings136164 -Node: interactive139563 -Node: external141662 -Node: operations143243 -Node: Basic tar143502 -Ref: Basic tar-Footnote-1146609 -Node: Advanced tar146753 -Node: Operations147598 -Node: append149497 -Ref: append-Footnote-1152592 -Node: appending files152779 -Node: multiple154517 -Node: update157239 -Node: how to update158215 -Node: concatenate159999 -Ref: concatenate-Footnote-1163247 -Node: delete163390 -Node: compare165163 -Node: create options166595 -Node: override167053 -Node: Ignore Failed Read171190 -Node: extract options171410 -Node: Reading172243 -Node: read full records173743 -Node: Ignore Zeros174079 -Node: Writing175070 -Node: Dealing with Old Files175627 -Node: Overwrite Old Files178430 -Node: Keep Old Files179887 -Node: Keep Newer Files180694 -Node: Unlink First180984 -Node: Recursive Unlink181388 -Node: Data Modification Times181941 -Node: Setting Access Permissions182751 -Node: Directory Modification Times and Permissions183383 -Node: Writing to Standard Output186995 -Node: Writing to an External Program188530 -Node: remove files192111 -Node: Scarce192304 -Node: Starting File192552 -Node: Same Order193353 -Node: backup194189 -Node: Applications197275 -Node: looking ahead198736 -Node: Backups199562 -Node: Full Dumps201143 -Node: Incremental Dumps202949 -Ref: --level=0205863 -Ref: device numbers206396 -Ref: incremental-op210374 -Ref: Incremental Dumps-Footnote-1210748 -Ref: Incremental Dumps-Footnote-2210898 -Node: Backup Levels211386 -Node: Backup Parameters213773 -Node: General-Purpose Variables214954 -Ref: RSH218115 -Node: Magnetic Tape Control219994 -Node: User Hooks221332 -Node: backup-specs example222661 -Node: Scripted Backups223804 -Ref: Scripted Backups-Footnote-1226667 -Node: Scripted Restoration227051 -Node: Choosing229662 -Node: file230784 -Ref: remote-dev233420 -Ref: local and remote archives233805 -Node: Selecting Archive Members234836 -Ref: input name quoting235517 -Node: files237503 -Ref: files-Footnote-1239999 -Node: nul240157 -Node: exclude242571 -Node: problems with exclude247745 -Node: wildcards249790 -Node: controlling pattern-matching252374 -Ref: controlling pattern-matching-Footnote-1256364 -Node: quoting styles256580 -Ref: escape sequences256926 -Node: transform263057 -Ref: show-transformed-names265048 -Node: after271239 -Node: recurse274841 -Node: one277565 -Node: directory278998 -Node: absolute282060 -Ref: absolute-Footnote-1285388 -Node: Date input formats285739 -Node: General date syntax288137 -Node: Calendar date items291120 -Node: Time of day items293117 -Node: Time zone items295313 -Node: Combined date and time of day items296565 -Node: Day of week items297417 -Node: Relative items in date strings298426 -Node: Pure numbers in date strings301228 -Node: Seconds since the Epoch302209 -Node: Specifying time zone rules303830 -Node: Authors of parse_datetime306202 -Ref: Authors of get_date306381 -Node: Formats307344 -Node: Compression312032 -Node: gzip312324 -Ref: alternative decompression programs314533 -Ref: auto-compress318303 -Ref: use-compress-program319034 -Ref: gzip-Footnote-1320957 -Ref: gzip-Footnote-2321006 -Node: lbzip2321146 -Node: sparse322243 -Node: Attributes325297 -Node: Portability331118 -Node: Portable Names332604 -Node: dereference333309 -Node: hard links334436 -Ref: hard links-Footnote-1337321 -Node: old337377 -Node: ustar338561 -Node: gnu339152 -Node: posix340029 -Node: PAX keywords340510 -Node: Checksumming346120 -Node: Large or Negative Values348046 -Node: Other Tars349646 -Node: Split Recovery350782 -Node: Sparse Recovery354514 -Ref: extracting sparse v.0.x358147 -Ref: Sparse Recovery-Footnote-1361436 -Ref: Sparse Recovery-Footnote-2361459 -Node: cpio361580 -Node: Media366337 -Node: Device368284 -Ref: size-suffixes373073 -Node: Remote Tape Server374193 -Node: Common Problems and Solutions377855 -Node: Blocking378247 -Ref: Blocking-Footnote-1384730 -Node: Format Variations384834 -Node: Blocking Factor385746 -Node: Many397398 -Node: Tape Positioning401192 -Node: mt403065 -Node: Using Multiple Tapes404620 -Node: Multi-Volume Archives406686 -Ref: tape-length408171 -Ref: change volume prompt408731 -Ref: volno-file409602 -Ref: info-script410154 -Ref: Multi-Volume Archives-Footnote-1415738 -Ref: Multi-Volume Archives-Footnote-2415848 -Node: Tape Files415916 -Node: Tarcat417398 -Node: label418443 -Ref: --test-label option420030 -Ref: label-Footnote-1423480 -Ref: label-Footnote-2423589 -Ref: label-Footnote-3423722 -Node: verify423957 -Node: Write Protection427257 -Node: Reliability and security428087 -Node: Reliability428475 -Node: Permissions problems429253 -Node: Data corruption and repair429692 -Node: Race conditions430618 -Node: Security432358 -Node: Privacy432961 -Node: Integrity434210 -Node: Live untrusted data436421 -Node: Security rules of thumb438761 -Node: Changes440290 -Node: Configuring Help Summary443905 -Node: Fixing Snapshot Files450406 -Node: Tar Internals453775 -Node: Standard454107 -Node: Extensions476308 -Node: Sparse Formats478868 -Node: Old GNU Format480158 -Node: PAX 0482559 -Node: PAX 1485690 -Node: Snapshot Files487428 -Node: Dumpdir492998 -Node: Genfile496244 -Node: Generate Mode497337 -Node: Status Mode501634 -Node: Exec Mode503432 -Node: Free Software Needs Free Documentation506177 -Node: GNU Free Documentation License511159 -Node: Index of Command Line Options536372 -Node: Index562228 +Node: Top1141 +Node: Introduction10443 +Node: Book Contents11230 +Node: Definitions13402 +Node: What tar Does15205 +Node: Naming tar Archives17971 +Node: Authors18691 +Node: Reports20504 +Node: Tutorial20861 +Node: assumptions21674 +Node: stylistic conventions24149 +Node: basic tar options24592 +Node: frequent operations28230 +Node: Two Frequent Options28882 +Node: file tutorial29513 +Node: verbose tutorial30870 +Ref: verbose member listing33084 +Node: help tutorial35844 +Node: create36198 +Node: prepare for examples37699 +Node: Creating the archive39468 +Node: create verbose42300 +Node: short create43120 +Node: create dir45873 +Node: list48581 +Ref: listing member and file names49860 +Node: list dir52174 +Node: extract53186 +Node: extracting archives54300 +Node: extracting files54805 +Ref: extracting files-Footnote-157452 +Node: extract dir57832 +Node: extracting untrusted archives60225 +Node: failing commands61104 +Node: going further62198 +Node: tar invocation62411 +Node: Synopsis64191 +Ref: exit status67512 +Node: using tar options69146 +Ref: TAR_OPTIONS70723 +Node: Styles71740 +Ref: Styles-Footnote-173239 +Node: Long Options73495 +Node: Short Options75667 +Ref: Short Options-Footnote-177475 +Node: Old Options77692 +Node: Mixing80455 +Ref: Mixing-Footnote-182821 +Node: All Options82941 +Node: Operation Summary83546 +Ref: --append83666 +Ref: --catenate83746 +Ref: --compare83817 +Ref: --concatenate84020 +Ref: --create84130 +Ref: --delete84198 +Ref: --diff84312 +Ref: --extract84368 +Ref: --get84470 +Ref: --list84528 +Ref: --update84596 +Node: Option Summary84806 +Ref: --absolute-names84961 +Ref: --after-date85251 +Ref: --anchored85303 +Ref: --atime-preserve85436 +Ref: --auto-compress87956 +Ref: --backup88183 +Ref: --block-number88374 +Ref: --blocking-factor88548 +Ref: --bzip288700 +Ref: --check-device88807 +Ref: --checkpoint89002 +Ref: --checkpoint-action89444 +Ref: --check-links90595 +Ref: --compress90872 +Ref: --uncompress90872 +Ref: --confirmation91076 +Ref: --delay-directory-restore91144 +Ref: --dereference91345 +Ref: --directory91539 +Ref: --exclude91792 +Ref: --exclude-backups91911 +Ref: --exclude-from92001 +Ref: --exclude-caches92147 +Ref: --exclude-caches-under92355 +Ref: --exclude-caches-all92533 +Ref: --exclude-ignore92662 +Ref: --exclude-ignore-recursive92882 +Ref: --exclude-tag93126 +Ref: --exclude-tag-under93297 +Ref: --exclude-tag-all93487 +Ref: --exclude-vcs93616 +Ref: --exclude-vcs-ignores93775 +Ref: --file94167 +Ref: --files-from94367 +Ref: --force-local94570 +Ref: --format94761 +Ref: --full-time95431 +Ref: --group96111 +Ref: --gzip96407 +Ref: --gunzip96407 +Ref: --ungzip96407 +Ref: --hard-dereference96630 +Ref: --help96817 +Ref: --ignore-case96951 +Ref: --ignore-command-error97078 +Ref: --ignore-failed-read97189 +Ref: --ignore-zeros97330 +Ref: --incremental97475 +Ref: --index-file97740 +Ref: --info-script97825 +Ref: --new-volume-script97825 +Ref: --interactive98122 +Ref: ----keep-directory-symlink98334 +Ref: --keep-newer-files98882 +Ref: --keep-old-files99024 +Ref: --label99236 +Ref: --level99524 +Ref: --listed-incremental99965 +Ref: --lzip100329 +Ref: --lzma100429 +Ref: --mode100629 +Ref: --mtime100920 +Ref: --multi-volume101361 +Ref: --newer101565 +Ref: --newer-mtime101843 +Ref: --no-anchored102067 +Ref: --no-auto-compress102204 +Ref: --no-check-device102355 +Ref: --no-delay-directory-restore102538 +Ref: --no-ignore-case102791 +Ref: --no-ignore-command-error102884 +Ref: --no-null103039 +Ref: --no-overwrite-dir103244 +Ref: --no-quote-chars103387 +Ref: --no-recursion103568 +Ref: --no-same-owner103673 +Ref: --no-same-permissions103856 +Ref: --no-seek104058 +Ref: --no-unquote104276 +Ref: --no-wildcards104414 +Ref: --no-wildcards-match-slash104498 +Ref: --null104600 +Ref: --numeric-owner104828 +Ref: --occurrence105479 +Ref: --old-archive106046 +Ref: --one-file-system106095 +Ref: --one-top-level106273 +Ref: --overwrite106909 +Ref: --overwrite-dir107051 +Ref: --owner107196 +Ref: --pax-option107521 +Ref: --portability107828 +Ref: --posix107893 +Ref: --preserve107935 +Ref: --preserve-order108073 +Ref: --preserve-permissions108137 +Ref: --same-permissions108137 +Ref: --quote-chars108551 +Ref: --quoting-style108704 +Ref: --read-full-records109025 +Ref: --record-size109190 +Ref: --recursion109534 +Ref: --recursive-unlink109637 +Ref: --remove-files109804 +Ref: --restrict109950 +Ref: --rmt-command110138 +Ref: --rsh-command110279 +Ref: --same-order110401 +Ref: --same-owner110693 +Ref: --seek111070 +Ref: --show-defaults111439 +Ref: --show-omitted-dirs111947 +Ref: --show-snapshot-field-ranges112101 +Ref: --show-transformed-names112297 +Ref: --show-stored-names112297 +Ref: --skip-old-files112686 +Ref: --sort113136 +Ref: --sparse113780 +Ref: --sparse-version113919 +Ref: --starting-file114143 +Ref: --strip-components114332 +Ref: --suffix114644 +Ref: --tape-length114763 +Ref: --test-label115178 +Ref: --to-command115330 +Ref: --to-stdout115489 +Ref: --totals115642 +Ref: --touch115873 +Ref: --transform116075 +Ref: --xform116075 +Ref: --unlink-first116686 +Ref: --unquote116854 +Ref: --use-compress-program116961 +Ref: --utc117139 +Ref: --verbose117232 +Ref: --verify117484 +Ref: --version117602 +Ref: --volno-file117774 +Ref: --warning117961 +Ref: --wildcards118138 +Ref: --wildcards-match-slash118258 +Ref: --xz118350 +Ref: Option Summary-Footnote-1118481 +Node: Short Option Summary118699 +Node: help120900 +Ref: help-Footnote-1124734 +Node: defaults124945 +Node: verbose125964 +Ref: totals128265 +Ref: Progress information129855 +Ref: show-omitted-dirs130834 +Ref: block-number131253 +Ref: verbose-Footnote-1132280 +Node: checkpoints132387 +Ref: checkpoint exec138449 +Node: warnings140475 +Node: interactive143874 +Node: external145973 +Node: operations147554 +Node: Basic tar147813 +Ref: Basic tar-Footnote-1150920 +Node: Advanced tar151064 +Node: Operations151909 +Node: append153808 +Ref: append-Footnote-1156903 +Node: appending files157090 +Node: multiple158828 +Node: update161550 +Node: how to update162526 +Node: concatenate164310 +Ref: concatenate-Footnote-1167558 +Node: delete167701 +Node: compare169474 +Node: create options170906 +Node: override171364 +Node: Ignore Failed Read175501 +Node: extract options175721 +Node: Reading176554 +Node: read full records178054 +Node: Ignore Zeros178390 +Node: Writing179381 +Node: Dealing with Old Files179938 +Node: Overwrite Old Files182741 +Node: Keep Old Files184198 +Node: Keep Newer Files185005 +Node: Unlink First185295 +Node: Recursive Unlink185699 +Node: Data Modification Times186252 +Node: Setting Access Permissions187062 +Node: Directory Modification Times and Permissions187694 +Node: Writing to Standard Output191306 +Node: Writing to an External Program192841 +Node: remove files196422 +Node: Scarce196615 +Node: Starting File196863 +Node: Same Order197664 +Node: backup198500 +Node: Applications201586 +Node: looking ahead203047 +Node: Backups203873 +Node: Full Dumps205454 +Node: Incremental Dumps207260 +Ref: --level=0210174 +Ref: device numbers210707 +Ref: incremental-op214685 +Ref: Incremental Dumps-Footnote-1215059 +Ref: Incremental Dumps-Footnote-2215209 +Node: Backup Levels215697 +Node: Backup Parameters218084 +Node: General-Purpose Variables219265 +Ref: RSH222426 +Node: Magnetic Tape Control224305 +Node: User Hooks225643 +Node: backup-specs example226972 +Node: Scripted Backups228115 +Ref: Scripted Backups-Footnote-1230978 +Node: Scripted Restoration231362 +Node: Choosing233973 +Node: file235095 +Ref: remote-dev237731 +Ref: local and remote archives238116 +Node: Selecting Archive Members239147 +Ref: input name quoting239828 +Node: files241814 +Ref: files-Footnote-1244310 +Node: nul244468 +Node: exclude246882 +Ref: exclude-vcs-ignores248437 +Ref: exclude-vcs250146 +Ref: exclude-Footnote-1254048 +Ref: exclude-Footnote-2254303 +Node: problems with exclude254374 +Node: wildcards256419 +Node: controlling pattern-matching259003 +Ref: controlling pattern-matching-Footnote-1262993 +Node: quoting styles263209 +Ref: escape sequences263555 +Node: transform269686 +Ref: show-transformed-names271677 +Node: after277868 +Node: recurse281470 +Node: one284194 +Node: directory285627 +Node: absolute288689 +Ref: absolute-Footnote-1292017 +Node: Date input formats292368 +Node: General date syntax294766 +Node: Calendar date items297749 +Node: Time of day items299746 +Node: Time zone items301942 +Node: Combined date and time of day items303194 +Node: Day of week items304046 +Node: Relative items in date strings305055 +Node: Pure numbers in date strings307857 +Node: Seconds since the Epoch308838 +Node: Specifying time zone rules310459 +Node: Authors of parse_datetime312831 +Ref: Authors of get_date313010 +Node: Formats313973 +Node: Compression318661 +Node: gzip318953 +Ref: alternative decompression programs321162 +Ref: auto-compress324932 +Ref: use-compress-program325663 +Ref: gzip-Footnote-1327586 +Ref: gzip-Footnote-2327635 +Node: lbzip2327775 +Node: sparse328872 +Node: Attributes331926 +Node: Portability337747 +Node: Portable Names339233 +Node: dereference339938 +Node: hard links341065 +Ref: hard links-Footnote-1343950 +Node: old344006 +Node: ustar345190 +Node: gnu345793 +Node: posix346670 +Node: PAX keywords347151 +Node: Checksumming352761 +Node: Large or Negative Values354704 +Node: Other Tars356304 +Node: Split Recovery357440 +Node: Sparse Recovery361172 +Ref: extracting sparse v.0.x364805 +Ref: Sparse Recovery-Footnote-1368094 +Ref: Sparse Recovery-Footnote-2368117 +Node: cpio368238 +Node: Media372995 +Node: Device374942 +Ref: size-suffixes379731 +Node: Remote Tape Server380851 +Node: Common Problems and Solutions384513 +Node: Blocking384905 +Ref: Blocking-Footnote-1391388 +Node: Format Variations391492 +Node: Blocking Factor392404 +Node: Many404056 +Node: Tape Positioning407850 +Node: mt409723 +Node: Using Multiple Tapes411278 +Node: Multi-Volume Archives413344 +Ref: tape-length414829 +Ref: change volume prompt415389 +Ref: volno-file416260 +Ref: info-script416812 +Ref: Multi-Volume Archives-Footnote-1422396 +Ref: Multi-Volume Archives-Footnote-2422506 +Node: Tape Files422574 +Node: Tarcat424056 +Node: label425101 +Ref: --test-label option426688 +Ref: label-Footnote-1430138 +Ref: label-Footnote-2430247 +Ref: label-Footnote-3430380 +Node: verify430615 +Node: Write Protection433915 +Node: Reliability and security434745 +Node: Reliability435133 +Node: Permissions problems435911 +Node: Data corruption and repair436350 +Node: Race conditions437276 +Node: Security439016 +Node: Privacy439619 +Node: Integrity440868 +Node: Live untrusted data443079 +Node: Security rules of thumb445419 +Node: Changes446948 +Node: Configuring Help Summary450563 +Node: Fixing Snapshot Files457064 +Node: Tar Internals460433 +Node: Standard460765 +Node: Extensions482966 +Node: Sparse Formats485526 +Node: Old GNU Format486816 +Node: PAX 0489217 +Node: PAX 1492348 +Node: Snapshot Files494086 +Node: Dumpdir499656 +Node: Genfile502902 +Node: Generate Mode503995 +Node: Status Mode508292 +Node: Exec Mode510090 +Node: Free Software Needs Free Documentation512835 +Node: GNU Free Documentation License517817 +Node: Index of Command Line Options543033 +Node: Index569473  End Tag Table diff --git a/doc/tar.info-1 b/doc/tar.info-1 index c8541d8..6fe9be8 100644 --- a/doc/tar.info-1 +++ b/doc/tar.info-1 @@ -1,6 +1,6 @@ This is tar.info, produced by makeinfo version 4.13 from tar.texi. -This manual is for GNU `tar' (version 1.27, 24 September 2013), which +This manual is for GNU `tar' (version 1.28, 22 July 2014), which creates and extracts files from archives. Copyright (C) 1992, 1994-1997, 1999-2001, 2003-2013 Free Software @@ -34,7 +34,7 @@ File: tar.info, Node: Top, Next: Introduction, Up: (dir) GNU tar: an archiver tool ************************* -This manual is for GNU `tar' (version 1.27, 24 September 2013), which +This manual is for GNU `tar' (version 1.28, 22 July 2014), which creates and extracts files from archives. Copyright (C) 1992, 1994-1997, 1999-2001, 2003-2013 Free Software @@ -567,7 +567,7 @@ in version 1.11. Thomas Bushnell, n/BSG and Amy Gorin worked on a tutorial and manual for GNU `tar'. Franc,ois Pinard put version 1.11.8 of the manual together by taking information from all these sources and merging them. Melissa Weisshaus finally edited and redesigned the book -to create version 1.12. The book for versions from 1.14 up to 1.27 +to create version 1.12. The book for versions from 1.14 up to 1.28 were edited by the current maintainer, Sergey Poznyakoff. For version 1.12, Daniel Hagerty contributed a great deal of @@ -2340,6 +2340,16 @@ File: tar.info, Node: Option Summary, Next: Short Option Summary, Prev: Opera Exclude from dump any directory containing a valid cache directory tag file. *Note exclude::. +`--exclude-ignore=FILE' + Before dumping a directory, `tar' checks if it contains FILE. If + so, exclusion patterns are read from this file. The patterns + affect only the directory itself. *Note exclude::. + +`--exclude-ignore-recursive=FILE' + Before dumping a directory, `tar' checks if it contains FILE. If + so, exclusion patterns are read from this file. The patterns + affect the directory and all itssubdirectories. *Note exclude::. + `--exclude-tag=FILE' Exclude from dump any directory containing file named FILE, but dump the directory node and FILE itself. *Note exclude-tag: @@ -2358,7 +2368,15 @@ File: tar.info, Node: Option Summary, Next: Short Option Summary, Prev: Opera Exclude from dump directories and files, that are internal for some widely used version control systems. - *Note exclude-vcs: exclude. + *Note exclude-vcs::. + +`--exclude-vcs-ignores' + Exclude files that match patterns read from VCS-specific ignore + files. Supported files are: `.cvsignore', `.gitignore', + `.bzrignore', and `.hgignore'. The semantics of each file is the + same as for the corresponding VCS, e.g. patterns read from + `.gitignore' affect the directory and all its subdirectories. + *Note exclude-vcs-ignores::. `--file=ARCHIVE' `-f ARCHIVE' @@ -2523,7 +2541,7 @@ File: tar.info, Node: Option Summary, Next: Short Option Summary, Prev: Opera `--level=N' Force incremental backup of level N. As of GNU `tar' version - 1.27, the option `--level=0' truncates the snapshot file, thereby + 1.28, the option `--level=0' truncates the snapshot file, thereby forcing the level 0 dump. Other values of N are effectively ignored. *Note --level=0::, for details and examples. @@ -2702,6 +2720,17 @@ File: tar.info, Node: Option Summary, Next: Short Option Summary, Prev: Opera directories that are on different file systems from the current directory. +`--one-top-level[=DIR]' + Tells `tar' to create a new directory beneath the extraction + directory (or the one passed to `-C') and use it to guard against + tarbombs. In the absence of DIR argument, the name of the new + directory will be equal to the base name of the archive (file name + minus the archive suffix, if recognized). Any member names that + do not begin with that directory name (after transformations from + `--transform' and `--strip-components') will be prefixed with it. + Recognized file name suffixes are `.tar', and any compression + suffixes recognizable by *Note --auto-compress::. + `--overwrite' Overwrite existing files and directory metadata when extracting files from an archive. *Note Overwrite Old Files::. @@ -2864,6 +2893,25 @@ File: tar.info, Node: Option Summary, Next: Short Option Summary, Prev: Opera this option to produce warning messages about existing old files (*note warnings::). +`--sort=ORDER' + Specify the directory sorting order when reading directories. + ORDER may be one of the following: + + `none' + No directory sorting is performed. This is the default. + + `name' + Sort the directory entries on name. The operating system may + deliver directory entries in a more or less random order, and + sorting them makes archive creation reproducible. + + `inode' + Sort the directory entries on inode number. Sorting + directories on inode number may reduce the amount of disk + seek operations when creating an archive for some file + systems. + + `--sparse' `-S' Invokes a GNU extension when adding files to an archive that @@ -3083,8 +3131,8 @@ information about its name, version, origin and legal status, all on standard output, and then exit successfully. For example, `tar --version' might print: - tar (GNU tar) 1.27 - Copyright (C) 2013 Free Software Foundation, Inc. + tar (GNU tar) 1.28 + Copyright (C) 2013-2014 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later . This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. @@ -3364,18 +3412,59 @@ do so by placing an equals sign and the message right after it, e.g.: --checkpoint-action="echo=Hit %s checkpoint #%u" - The `%s' and `%u' in the above example are "meta-characters". The -`%s' meta-character is replaced with the "type" of the checkpoint: -`write' or `read' (or a corresponding translated version in locales -other than POSIX). The `%u' meta-character is replaced with the -ordinal number of the checkpoint. Thus, the above example could -produce the following output when used with the `--create' option: + The `%s' and `%u' in the above example are "format specifiers". The +`%s' specifier is replaced with the "type" of the checkpoint: `write' or +`read' (or a corresponding translated version in locales other than +POSIX). The `%u' specifier is replaced with the ordinal number of the +checkpoint. Thus, the above example could produce the following output +when used with the `--create' option: tar: Hit write checkpoint #10 tar: Hit write checkpoint #20 tar: Hit write checkpoint #30 - Aside from meta-character expansion, the message string is subject to + The complete list of available format specifiers follows. Some of +them can take optional arguments. These arguments, if given, are +supplied in curly braces between the percent sign and the specifier +letter. + +`%s' + Print type of the checkpoint (`write' or `read'). + +`%u' + Print number of the checkpoint. + +`%{r,w,d}T' + Print number of bytes transferred so far and approximate transfer + speed. Optional arguments supply prefixes to be used before number + of bytes read, written and deleted, correspondingly. If absent, + they default to `R'. `W', `D'. Any or all of them can be omitted, + so, that e.g. `%{}T' means to print corresponding statistics + without any prefixes. Any surplus arguments, if present, are + silently ignored. + + $ tar --delete -f f.tar --checkpoint-action=echo="#%u: %T" main.c + tar: #1: R: 0 (0B, 0B/s),W: 0 (0B, 0B/s),D: 0 + tar: #2: R: 10240 (10KiB, 19MiB/s),W: 0 (0B, 0B/s),D: 10240 + + See also the `totals' action, described below. + +`%{FMT}t' + Output current local time using FMT as format for `strftime' + (*note strftime: (strftime(3))strftime.). The `{FMT}' part is + optional. If not present, the default format is `%c', i.e. the + preferred date and time representation for the current locale. + +`%{N}*' + Pad output with spaces to the Nth column. If the `{N}' part is + omitted, the current screen width is assumed. + +`%c' + This is a shortcut for `%{%Y-%m-%d %H:%M:%S}t: %ds, + %{read,wrote}T%*\r', intended mainly for use with `ttyout' action + (see below). + + Aside from format expansion, the message string is subject to "unquoting", during which the backslash "escape sequences" are replaced with their corresponding ASCII characters (*note escape sequences::). E.g. the following action will produce an audible bell and the message @@ -3396,7 +3485,16 @@ to the string, nor does it output a newline after it. For example, the following action will print the checkpoint message at the same screen line, overwriting any previous message: - --checkpoint-action="ttyout=\rHit %s checkpoint #%u" + --checkpoint-action="ttyout=Hit %s checkpoint #%u%*\r" + +Notice the use of `%*' specifier to clear out any eventual remains of +the prior output line. As as more complex example, consider this: + + --checkpoint-action=ttyout='%{%Y-%m-%d %H:%M:%S}t (%d sec): #%u, %T%*\r' + +This prints the current local time, number of seconds expired since tar +was started, the checkpoint ordinal number, transferred bytes and +average computed I/O speed. Another available checkpoint action is `dot' (or `.'). It instructs `tar' to print a single dot on the standard listing stream, e.g.: @@ -3408,6 +3506,11 @@ line, overwriting any previous message: be abbreviated by placing a dot in front of the checkpoint frequency, as shown in the previous section. + The `totals' action prints the total number of bytes transferred so +far. The format of the data is the same as for the `--totals' option +(*note totals::). See also `%T' format specifier of the `echo' or +`ttyout' action. + Yet another action, `sleep', pauses `tar' for a specified amount of seconds. The following example will stop for 30 seconds at each checkpoint: @@ -6214,12 +6317,60 @@ difficult to catch using text editors. However, empty lines are OK. + When archiving directories that are under some version control +system (VCS), it is often convenient to read exclusion patterns from +this VCS' ignore files (e.g. `.cvsignore', `.gitignore', etc.) The +following options provide such possibilty: + +`--exclude-vcs-ignores' + Before archiving a directory, see if it contains any of the + following files: `cvsignore', `.gitignore', `.bzrignore', or + `.hgignore'. If so, read ignore patterns from these files. + + The patterns are treated much as the corresponding VCS would treat + them, i.e.: + + `.cvsignore' + Contains shell-style globbing patterns that apply only to the + directory where this file resides. No comments are allowed + in the file. Empty lines are ignored. + + `.gitignore' + Contains shell-style globbing patterns. Applies to the + directory where `.gitfile' is located and all its + subdirectories. + + Any line beginning with a `#' is a comment. Backslash escapes + the comment character. + + `.bzrignore' + Contains shell globbing-patterns and regular expressions (if + prefixed with `RE:'(1). Patterns affect the directory and + all its subdirectories. + + Any line beginning with a `#' is a comment. + + `.hgignore' + Contains posix regular expressions(2). The line `syntax: + glob' switches to shell globbing patterns. The line `syntax: + regexp' switches back. Comments begin with a `#'. Patterns + affect the directory and all its subdirectories. + +`--exclude-ignore=FILE' + Before dumping a directory, `tar' checks if it contains FILE. If + so, exclusion patterns are read from this file. The patterns + affect only the directory itself. + +`--exclude-ignore-recursive=FILE' + Same as `--exclude-ignore', except that the patterns read affect + both the directory where FILE resides and all its subdirectories. + `--exclude-vcs' Exclude files and directories used by following version control systems: `CVS', `RCS', `SCCS', `SVN', `Arch', `Bazaar', `Mercurial', and `Darcs'. - As of version 1.27, the following files are excluded: + As of version 1.28, the following files are excluded: * `CVS/', and everything under it @@ -6363,6 +6514,15 @@ entirely: * problems with exclude:: + ---------- Footnotes ---------- + + (1) According to the Bazaar docs, globbing-patterns are Korn-shell +style and regular expressions are perl-style. As of GNU `tar' version +1.28, these are treated as shell-style globs and posix extended +regexps. This will be fixed in future releases. + + (2) Support for perl-style regexps will appear in future releases. +  File: tar.info, Node: problems with exclude, Up: exclude @@ -7558,120 +7718,3 @@ any of the following: MONTH DAY - -File: tar.info, Node: Time of day items, Next: Time zone items, Prev: Calendar date items, Up: Date input formats - -7.3 Time of day items -===================== - -A "time of day item" in date strings specifies the time on a given day. -Here are some examples, all of which represent the same time: - - 20:02:00.000000 - 20:02 - 8:02pm - 20:02-0500 # In EST (U.S. Eastern Standard Time). - - More generally, the time of day may be given as -`HOUR:MINUTE:SECOND', where HOUR is a number between 0 and 23, MINUTE -is a number between 0 and 59, and SECOND is a number between 0 and 59 -possibly followed by `.' or `,' and a fraction containing one or more -digits. Alternatively, `:SECOND' can be omitted, in which case it is -taken to be zero. On the rare hosts that support leap seconds, SECOND -may be 60. - - If the time is followed by `am' or `pm' (or `a.m.' or `p.m.'), HOUR -is restricted to run from 1 to 12, and `:MINUTE' may be omitted (taken -to be zero). `am' indicates the first half of the day, `pm' indicates -the second half of the day. In this notation, 12 is the predecessor of -1: midnight is `12am' while noon is `12pm'. (This is the zero-oriented -interpretation of `12am' and `12pm', as opposed to the old tradition -derived from Latin which uses `12m' for noon and `12pm' for midnight.) - - The time may alternatively be followed by a time zone correction, -expressed as `SHHMM', where S is `+' or `-', HH is a number of zone -hours and MM is a number of zone minutes. The zone minutes term, MM, -may be omitted, in which case the one- or two-digit correction is -interpreted as a number of hours. You can also separate HH from MM -with a colon. When a time zone correction is given this way, it forces -interpretation of the time relative to Coordinated Universal Time -(UTC), overriding any previous specification for the time zone or the -local time zone. For example, `+0530' and `+05:30' both stand for the -time zone 5.5 hours ahead of UTC (e.g., India). This is the best way to -specify a time zone correction by fractional parts of an hour. The -maximum zone correction is 24 hours. - - Either `am'/`pm' or a time zone correction may be specified, but not -both. - - -File: tar.info, Node: Time zone items, Next: Combined date and time of day items, Prev: Time of day items, Up: Date input formats - -7.4 Time zone items -=================== - -A "time zone item" specifies an international time zone, indicated by a -small set of letters, e.g., `UTC' or `Z' for Coordinated Universal -Time. Any included periods are ignored. By following a -non-daylight-saving time zone by the string `DST' in a separate word -(that is, separated by some white space), the corresponding daylight -saving time zone may be specified. Alternatively, a -non-daylight-saving time zone can be followed by a time zone -correction, to add the two values. This is normally done only for -`UTC'; for example, `UTC+05:30' is equivalent to `+05:30'. - - Time zone items other than `UTC' and `Z' are obsolescent and are not -recommended, because they are ambiguous; for example, `EST' has a -different meaning in Australia than in the United States. Instead, -it's better to use unambiguous numeric time zone corrections like -`-0500', as described in the previous section. - - If neither a time zone item nor a time zone correction is supplied, -time stamps are interpreted using the rules of the default time zone -(*note Specifying time zone rules::). - - -File: tar.info, Node: Combined date and time of day items, Next: Day of week items, Prev: Time zone items, Up: Date input formats - -7.5 Combined date and time of day items -======================================= - -The ISO 8601 date and time of day extended format consists of an ISO -8601 date, a `T' character separator, and an ISO 8601 time of day. -This format is also recognized if the `T' is replaced by a space. - - In this format, the time of day should use 24-hour notation. -Fractional seconds are allowed, with either comma or period preceding -the fraction. ISO 8601 fractional minutes and hours are not supported. -Typically, hosts support nanosecond timestamp resolution; excess -precision is silently discarded. - - Here are some examples: - - 2012-09-24T20:02:00.052-0500 - 2012-12-31T23:59:59,999999999+1100 - 1970-01-01 00:00Z - - -File: tar.info, Node: Day of week items, Next: Relative items in date strings, Prev: Combined date and time of day items, Up: Date input formats - -7.6 Day of week items -===================== - -The explicit mention of a day of the week will forward the date (only -if necessary) to reach that day of the week in the future. - - Days of the week may be spelled out in full: `Sunday', `Monday', -`Tuesday', `Wednesday', `Thursday', `Friday' or `Saturday'. Days may -be abbreviated to their first three letters, optionally followed by a -period. The special abbreviations `Tues' for `Tuesday', `Wednes' for -`Wednesday' and `Thur' or `Thurs' for `Thursday' are also allowed. - - A number may precede a day of the week item to move forward -supplementary weeks. It is best used in expression like `third -monday'. In this context, `last DAY' or `next DAY' is also acceptable; -they move one week before or after the day that DAY by itself would -represent. - - A comma following a day of the week item is ignored. - diff --git a/doc/tar.info-2 b/doc/tar.info-2 index e31d8b3..22c9814 100644 --- a/doc/tar.info-2 +++ b/doc/tar.info-2 @@ -1,6 +1,6 @@ This is tar.info, produced by makeinfo version 4.13 from tar.texi. -This manual is for GNU `tar' (version 1.27, 24 September 2013), which +This manual is for GNU `tar' (version 1.28, 22 July 2014), which creates and extracts files from archives. Copyright (C) 1992, 1994-1997, 1999-2001, 2003-2013 Free Software @@ -28,6 +28,123 @@ START-INFO-DIR-ENTRY * tar: (tar)tar invocation. Invoking GNU `tar'. END-INFO-DIR-ENTRY + +File: tar.info, Node: Time of day items, Next: Time zone items, Prev: Calendar date items, Up: Date input formats + +7.3 Time of day items +===================== + +A "time of day item" in date strings specifies the time on a given day. +Here are some examples, all of which represent the same time: + + 20:02:00.000000 + 20:02 + 8:02pm + 20:02-0500 # In EST (U.S. Eastern Standard Time). + + More generally, the time of day may be given as +`HOUR:MINUTE:SECOND', where HOUR is a number between 0 and 23, MINUTE +is a number between 0 and 59, and SECOND is a number between 0 and 59 +possibly followed by `.' or `,' and a fraction containing one or more +digits. Alternatively, `:SECOND' can be omitted, in which case it is +taken to be zero. On the rare hosts that support leap seconds, SECOND +may be 60. + + If the time is followed by `am' or `pm' (or `a.m.' or `p.m.'), HOUR +is restricted to run from 1 to 12, and `:MINUTE' may be omitted (taken +to be zero). `am' indicates the first half of the day, `pm' indicates +the second half of the day. In this notation, 12 is the predecessor of +1: midnight is `12am' while noon is `12pm'. (This is the zero-oriented +interpretation of `12am' and `12pm', as opposed to the old tradition +derived from Latin which uses `12m' for noon and `12pm' for midnight.) + + The time may alternatively be followed by a time zone correction, +expressed as `SHHMM', where S is `+' or `-', HH is a number of zone +hours and MM is a number of zone minutes. The zone minutes term, MM, +may be omitted, in which case the one- or two-digit correction is +interpreted as a number of hours. You can also separate HH from MM +with a colon. When a time zone correction is given this way, it forces +interpretation of the time relative to Coordinated Universal Time +(UTC), overriding any previous specification for the time zone or the +local time zone. For example, `+0530' and `+05:30' both stand for the +time zone 5.5 hours ahead of UTC (e.g., India). This is the best way to +specify a time zone correction by fractional parts of an hour. The +maximum zone correction is 24 hours. + + Either `am'/`pm' or a time zone correction may be specified, but not +both. + + +File: tar.info, Node: Time zone items, Next: Combined date and time of day items, Prev: Time of day items, Up: Date input formats + +7.4 Time zone items +=================== + +A "time zone item" specifies an international time zone, indicated by a +small set of letters, e.g., `UTC' or `Z' for Coordinated Universal +Time. Any included periods are ignored. By following a +non-daylight-saving time zone by the string `DST' in a separate word +(that is, separated by some white space), the corresponding daylight +saving time zone may be specified. Alternatively, a +non-daylight-saving time zone can be followed by a time zone +correction, to add the two values. This is normally done only for +`UTC'; for example, `UTC+05:30' is equivalent to `+05:30'. + + Time zone items other than `UTC' and `Z' are obsolescent and are not +recommended, because they are ambiguous; for example, `EST' has a +different meaning in Australia than in the United States. Instead, +it's better to use unambiguous numeric time zone corrections like +`-0500', as described in the previous section. + + If neither a time zone item nor a time zone correction is supplied, +time stamps are interpreted using the rules of the default time zone +(*note Specifying time zone rules::). + + +File: tar.info, Node: Combined date and time of day items, Next: Day of week items, Prev: Time zone items, Up: Date input formats + +7.5 Combined date and time of day items +======================================= + +The ISO 8601 date and time of day extended format consists of an ISO +8601 date, a `T' character separator, and an ISO 8601 time of day. +This format is also recognized if the `T' is replaced by a space. + + In this format, the time of day should use 24-hour notation. +Fractional seconds are allowed, with either comma or period preceding +the fraction. ISO 8601 fractional minutes and hours are not supported. +Typically, hosts support nanosecond timestamp resolution; excess +precision is silently discarded. + + Here are some examples: + + 2012-09-24T20:02:00.052-0500 + 2012-12-31T23:59:59,999999999+1100 + 1970-01-01 00:00Z + + +File: tar.info, Node: Day of week items, Next: Relative items in date strings, Prev: Combined date and time of day items, Up: Date input formats + +7.6 Day of week items +===================== + +The explicit mention of a day of the week will forward the date (only +if necessary) to reach that day of the week in the future. + + Days of the week may be spelled out in full: `Sunday', `Monday', +`Tuesday', `Wednesday', `Thursday', `Friday' or `Saturday'. Days may +be abbreviated to their first three letters, optionally followed by a +period. The special abbreviations `Tues' for `Tuesday', `Wednes' for +`Wednesday' and `Thur' or `Thurs' for `Thursday' are also allowed. + + A number may precede a day of the week item to move forward +supplementary weeks. It is best used in expression like `third +monday'. In this context, `last DAY' or `next DAY' is also acceptable; +they move one week before or after the day that DAY by itself would +represent. + + A comma following a day of the week item is ignored. +  File: tar.info, Node: Relative items in date strings, Next: Pure numbers in date strings, Prev: Day of week items, Up: Date input formats @@ -267,7 +384,7 @@ v7 Makefiles. This practice will change in the future, in the meantime, however this means that projects containing file names more than 99 characters long will not be able to use GNU `tar' - 1.27 and Automake prior to 1.9. + 1.28 and Automake prior to 1.9. ustar Archive format defined by POSIX.1-1988 specification. It stores @@ -403,7 +520,7 @@ a list of recognized suffixes). Some compression programs are able to handle different compression formats. GNU `tar' uses this, if the principal decompressor for the given format is not available. For example, if `compress' is not -installed, `tar' will try to use `gzip'. As of version 1.27 the +installed, `tar' will try to use `gzip'. As of version 1.28 the following alternatives are tried(2): Format Main decompressor Alternatives @@ -986,14 +1103,15 @@ File: tar.info, Node: ustar, Next: gnu, Prev: old, Up: Portability 8.3.5 Ustar Archive Format -------------------------- -Archive format defined by POSIX.1-1988 specification is called `ustar'. -Although it is more flexible than the V7 format, it still has many -restrictions (*note ustar: Formats, for the detailed description of -`ustar' format). Along with V7 format, `ustar' format is a good choice -for archives intended to be read with other implementations of `tar'. +The archive format defined by the POSIX.1-1988 specification is called +`ustar'. Although it is more flexible than the V7 format, it still has +many restrictions (*note ustar: Formats, for the detailed description +of `ustar' format). Along with V7 format, `ustar' format is a good +choice for archives intended to be read with other implementations of +`tar'. - To create archive in `ustar' format, use `--format=ustar' option in -conjunction with the `--create' (`-c'). + To create an archive in `ustar' format, use the `--format=ustar' +option in conjunction with `--create' (`-c').  File: tar.info, Node: gnu, Next: posix, Prev: ustar, Up: Portability @@ -1178,22 +1296,22 @@ File: tar.info, Node: Checksumming, Next: Large or Negative Values, Prev: pos SunOS and HP-UX `tar' fail to accept archives created using GNU `tar' and containing non-ASCII file names, that is, file names having -characters with the eight bit set, because they use signed checksums, +characters with the eighth bit set, because they use signed checksums, while GNU `tar' uses unsigned checksums while creating archives, as per POSIX standards. On reading, GNU `tar' computes both checksums and -accepts any. It is somewhat worrying that a lot of people may go -around doing backup of their files using faulty (or at least +accepts either of them. It is somewhat worrying that a lot of people +may go around doing backup of their files using faulty (or at least non-standard) software, not learning about it until it's time to restore their missing files with an incompatible file extractor, or vice versa. - GNU `tar' computes checksums both ways, and accept any on read, so -GNU tar can read Sun tapes even with their wrong checksums. GNU `tar' -produces the standard checksum, however, raising incompatibilities with -Sun. That is to say, GNU `tar' has not been modified to _produce_ -incorrect archives to be read by buggy `tar''s. I've been told that -more recent Sun `tar' now read standard archives, so maybe Sun did a -similar patch, after all? + GNU `tar' computes checksums both ways, and accepts either of them +on read, so GNU tar can read Sun tapes even with their wrong checksums. +GNU `tar' produces the standard checksum, however, raising +incompatibilities with Sun. That is to say, GNU `tar' has not been +modified to _produce_ incorrect archives to be read by buggy `tar''s. +I've been told that more recent Sun `tar' now read standard archives, +so maybe Sun did a similar patch, after all? The story seems to be that when Sun first imported `tar' sources on their system, they recompiled it without realizing that the checksums @@ -1201,7 +1319,7 @@ were computed differently, because of a change in the default signing of `char''s in their compiler. So they started computing checksums wrongly. When they later realized their mistake, they merely decided to stay compatible with it, and with themselves afterwards. -Presumably, but I do not really know, HP-UX has chosen that their `tar' +Presumably, but I do not really know, HP-UX has chosen their `tar' archives to be compatible with Sun's. The current standards do not favor Sun `tar' format. In any case, it now falls on the shoulders of SunOS and HP-UX users to get a `tar' able to read the good archives @@ -3285,7 +3403,7 @@ Appendix A Changes ****************** This appendix lists some important user-visible changes between version -GNU `tar' 1.27 and previous versions. An up-to-date version of this +GNU `tar' 1.28 and previous versions. An up-to-date version of this document is available at the GNU `tar' documentation page (http://www.gnu.org/software/tar/manual/changes.html). @@ -4353,13 +4471,13 @@ backups (*note Incremental Dumps::). It contains the status of the file system at the time of the dump and is used to determine which files were modified since the last backup. - GNU `tar' version 1.27 supports three snapshot file formats. The + GNU `tar' version 1.28 supports three snapshot file formats. The first format, called "format 0", is the one used by GNU `tar' versions up to and including 1.15.1. The second format, called "format 1" is an extended version of this format, that contains more metadata and allows for further extensions. It was used by alpha release version 1.15.90. For alpha version 1.15.91 and stable releases version 1.16 up through -1.27, the "format 2" is used. +1.28, the "format 2" is used. GNU `tar' is able to read all three formats, but will create snapshots only in format 2. @@ -4418,7 +4536,7 @@ snapshots only in format 2. 2. `Format 2' snapshot file begins with a format identifier, as described for version 1, e.g.: - GNU tar-1.27-2 + GNU tar-1.28-2 This line is followed by newline. Rest of file consists of records, separated by null (ASCII 0) characters. Thus, in contrast @@ -4986,7 +5104,8 @@ Appendix G GNU Free Documentation License Version 1.3, 3 November 2008 - Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 2000-2002, 2007-2008, 2014 Free Software + Foundation, Inc. `http://fsf.org/' Everyone is permitted to copy and distribute verbatim copies @@ -5478,7 +5597,7 @@ Summary::. [index] * Menu: -* --keep-directory-symlink, summary: Option Summary. (line 359) +* --keep-directory-symlink, summary: Option Summary. (line 377) * absolute-names: absolute. (line 10) * absolute-names, summary: Option Summary. (line 6) * add-file: files. (line 60) @@ -5542,24 +5661,30 @@ Summary::. * exclude, potential problems with: problems with exclude. (line 6) * exclude, summary: Option Summary. (line 181) -* exclude-backups: exclude. (line 82) +* exclude-backups: exclude. (line 130) * exclude-backups, summary: Option Summary. (line 185) -* exclude-caches: exclude. (line 105) +* exclude-caches: exclude. (line 153) * exclude-caches, summary: Option Summary. (line 193) -* exclude-caches-all: exclude. (line 113) +* exclude-caches-all: exclude. (line 161) * exclude-caches-all, summary: Option Summary. (line 206) -* exclude-caches-under: exclude. (line 109) +* exclude-caches-under: exclude. (line 157) * exclude-caches-under, summary: Option Summary. (line 200) * exclude-from: exclude. (line 6) * exclude-from, summary: Option Summary. (line 188) -* exclude-tag: exclude. (line 122) -* exclude-tag, summary: Option Summary. (line 210) -* exclude-tag-all: exclude. (line 130) -* exclude-tag-all, summary: Option Summary. (line 220) -* exclude-tag-under: exclude. (line 126) -* exclude-tag-under, summary: Option Summary. (line 215) -* exclude-vcs: exclude. (line 37) -* exclude-vcs, summary: Option Summary. (line 224) +* exclude-ignore: exclude. (line 76) +* exclude-ignore, summary: Option Summary. (line 210) +* exclude-ignore-recursive: exclude. (line 81) +* exclude-ignore-recursive, summary: Option Summary. (line 215) +* exclude-tag: exclude. (line 170) +* exclude-tag, summary: Option Summary. (line 220) +* exclude-tag-all: exclude. (line 178) +* exclude-tag-all, summary: Option Summary. (line 230) +* exclude-tag-under: exclude. (line 174) +* exclude-tag-under, summary: Option Summary. (line 225) +* exclude-vcs: exclude. (line 85) +* exclude-vcs, summary: Option Summary. (line 234) +* exclude-vcs-ignores: exclude. (line 42) +* exclude-vcs-ignores, summary: Option Summary. (line 240) * extract: extract. (line 6) * extract, additional options: extract options. (line 6) * extract, complementary notes: Basic tar. (line 48) @@ -5568,56 +5693,56 @@ Summary::. (line 121) * file: file. (line 6) * file, short description: file. (line 15) -* file, summary: Option Summary. (line 230) +* file, summary: Option Summary. (line 248) * file, tutorial: file tutorial. (line 6) * files-from: files. (line 14) -* files-from, summary: Option Summary. (line 236) +* files-from, summary: Option Summary. (line 254) * force-local, short description: Device. (line 70) -* force-local, summary: Option Summary. (line 242) -* format, summary: Option Summary. (line 247) -* full-time, summary: Option Summary. (line 272) +* force-local, summary: Option Summary. (line 260) +* format, summary: Option Summary. (line 265) +* full-time, summary: Option Summary. (line 290) * get, summary: Operation Summary. (line 42) * group: override. (line 88) -* group, summary: Option Summary. (line 290) -* gunzip, summary: Option Summary. (line 298) +* group, summary: Option Summary. (line 308) +* gunzip, summary: Option Summary. (line 316) * gzip: gzip. (line 91) -* gzip, summary: Option Summary. (line 298) +* gzip, summary: Option Summary. (line 316) * hard-dereference, described: hard links. (line 59) -* hard-dereference, summary: Option Summary. (line 306) +* hard-dereference, summary: Option Summary. (line 324) * help: help tutorial. (line 6) * help, introduction: help. (line 26) -* help, summary: Option Summary. (line 312) +* help, summary: Option Summary. (line 330) * ignore-case: controlling pattern-matching. (line 86) -* ignore-case, summary: Option Summary. (line 317) +* ignore-case, summary: Option Summary. (line 335) * ignore-command-error: Writing to an External Program. (line 110) -* ignore-command-error, summary: Option Summary. (line 321) +* ignore-command-error, summary: Option Summary. (line 339) * ignore-failed-read: Ignore Failed Read. (line 7) -* ignore-failed-read, summary: Option Summary. (line 325) +* ignore-failed-read, summary: Option Summary. (line 343) * ignore-zeros: Ignore Zeros. (line 6) * ignore-zeros, short description: Blocking Factor. (line 156) -* ignore-zeros, summary: Option Summary. (line 329) -* incremental, summary: Option Summary. (line 334) +* ignore-zeros, summary: Option Summary. (line 347) +* incremental, summary: Option Summary. (line 352) * incremental, using with --list: Incremental Dumps. (line 186) -* index-file, summary: Option Summary. (line 341) +* index-file, summary: Option Summary. (line 359) * info-script: Multi-Volume Archives. (line 88) * info-script, short description: Device. (line 122) -* info-script, summary: Option Summary. (line 344) +* info-script, summary: Option Summary. (line 362) * interactive: interactive. (line 14) -* interactive, summary: Option Summary. (line 352) +* interactive, summary: Option Summary. (line 370) * keep-newer-files: Keep Newer Files. (line 6) -* keep-newer-files, summary: Option Summary. (line 372) +* keep-newer-files, summary: Option Summary. (line 390) * keep-old-files: Keep Old Files. (line 9) * keep-old-files, introduced: Dealing with Old Files. (line 16) -* keep-old-files, summary: Option Summary. (line 376) +* keep-old-files, summary: Option Summary. (line 394) * label <1>: label. (line 6) * label: Tape Files. (line 6) -* label, summary: Option Summary. (line 384) +* label, summary: Option Summary. (line 402) * level, described: Incremental Dumps. (line 76) -* level, summary: Option Summary. (line 391) +* level, summary: Option Summary. (line 409) * list: list. (line 6) * list, summary: Operation Summary. (line 46) * list, using with --incremental: Incremental Dumps. (line 186) @@ -5625,207 +5750,209 @@ Summary::. * list, using with --verbose: list. (line 30) * list, using with file name arguments: list. (line 68) * listed-incremental, described: Incremental Dumps. (line 14) -* listed-incremental, summary: Option Summary. (line 401) +* listed-incremental, summary: Option Summary. (line 419) * listed-incremental, using with --extract: Incremental Dumps. (line 121) * listed-incremental, using with --list: Incremental Dumps. (line 186) * lzip: gzip. (line 104) -* lzip, summary: Option Summary. (line 409) +* lzip, summary: Option Summary. (line 427) * lzma: gzip. (line 107) -* lzma, summary: Option Summary. (line 413) +* lzma, summary: Option Summary. (line 431) * lzop: gzip. (line 110) * mode: override. (line 14) -* mode, summary: Option Summary. (line 421) +* mode, summary: Option Summary. (line 439) * mtime: override. (line 29) -* mtime, summary: Option Summary. (line 427) +* mtime, summary: Option Summary. (line 445) * multi-volume: Multi-Volume Archives. (line 6) * multi-volume, short description: Device. (line 88) -* multi-volume, summary: Option Summary. (line 436) +* multi-volume, summary: Option Summary. (line 454) * new-volume-script: Multi-Volume Archives. (line 88) * new-volume-script, short description: Device. (line 122) -* new-volume-script, summary: Option Summary. (line 344) +* new-volume-script, summary: Option Summary. (line 362) * newer: after. (line 24) -* newer, summary: Option Summary. (line 444) +* newer, summary: Option Summary. (line 462) * newer-mtime: after. (line 35) -* newer-mtime, summary: Option Summary. (line 452) +* newer-mtime, summary: Option Summary. (line 470) * no-anchored: controlling pattern-matching. (line 79) -* no-anchored, summary: Option Summary. (line 457) -* no-auto-compress, summary: Option Summary. (line 461) +* no-anchored, summary: Option Summary. (line 475) +* no-auto-compress, summary: Option Summary. (line 479) * no-check-device, described: Incremental Dumps. (line 104) -* no-check-device, summary: Option Summary. (line 465) +* no-check-device, summary: Option Summary. (line 483) * no-delay-directory-restore: Directory Modification Times and Permissions. (line 68) -* no-delay-directory-restore, summary: Option Summary. (line 470) +* no-delay-directory-restore, summary: Option Summary. (line 488) * no-ignore-case: controlling pattern-matching. (line 86) -* no-ignore-case, summary: Option Summary. (line 476) +* no-ignore-case, summary: Option Summary. (line 494) * no-ignore-command-error: Writing to an External Program. (line 115) -* no-ignore-command-error, summary: Option Summary. (line 479) +* no-ignore-command-error, summary: Option Summary. (line 497) * no-null, described: nul. (line 15) -* no-null, summary: Option Summary. (line 483) -* no-overwrite-dir, summary: Option Summary. (line 488) -* no-quote-chars, summary: Option Summary. (line 492) +* no-null, summary: Option Summary. (line 501) +* no-overwrite-dir, summary: Option Summary. (line 506) +* no-quote-chars, summary: Option Summary. (line 510) * no-recursion: recurse. (line 11) -* no-recursion, summary: Option Summary. (line 497) +* no-recursion, summary: Option Summary. (line 515) * no-same-owner: Attributes. (line 63) -* no-same-owner, summary: Option Summary. (line 501) -* no-same-permissions, summary: Option Summary. (line 507) -* no-seek, summary: Option Summary. (line 512) +* no-same-owner, summary: Option Summary. (line 519) +* no-same-permissions, summary: Option Summary. (line 525) +* no-seek, summary: Option Summary. (line 530) * no-unquote: Selecting Archive Members. (line 42) -* no-unquote, summary: Option Summary. (line 517) +* no-unquote, summary: Option Summary. (line 535) * no-wildcards: controlling pattern-matching. (line 41) -* no-wildcards, summary: Option Summary. (line 521) +* no-wildcards, summary: Option Summary. (line 539) * no-wildcards-match-slash: controlling pattern-matching. (line 92) -* no-wildcards-match-slash, summary: Option Summary. (line 524) +* no-wildcards-match-slash, summary: Option Summary. (line 542) * null, described: nul. (line 11) -* null, summary: Option Summary. (line 527) +* null, summary: Option Summary. (line 545) * numeric-owner: Attributes. (line 69) -* numeric-owner, summary: Option Summary. (line 533) +* numeric-owner, summary: Option Summary. (line 551) * occurrence, described: append. (line 34) -* occurrence, summary: Option Summary. (line 550) -* old-archive, summary: Option Summary. (line 564) +* occurrence, summary: Option Summary. (line 568) +* old-archive, summary: Option Summary. (line 582) * one-file-system: one. (line 14) -* one-file-system, summary: Option Summary. (line 567) +* one-file-system, summary: Option Summary. (line 585) +* one-top-level, summary: Option Summary. (line 590) * overwrite: Overwrite Old Files. (line 6) * overwrite, introduced: Dealing with Old Files. (line 32) -* overwrite, summary: Option Summary. (line 572) +* overwrite, summary: Option Summary. (line 601) * overwrite-dir: Overwrite Old Files. (line 28) * overwrite-dir, introduced: Dealing with Old Files. (line 6) -* overwrite-dir, summary: Option Summary. (line 576) +* overwrite-dir, summary: Option Summary. (line 605) * owner: override. (line 57) -* owner, summary: Option Summary. (line 580) +* owner, summary: Option Summary. (line 609) * pax-option: PAX keywords. (line 6) -* pax-option, summary: Option Summary. (line 588) -* portability, summary: Option Summary. (line 594) -* posix, summary: Option Summary. (line 598) +* pax-option, summary: Option Summary. (line 617) +* portability, summary: Option Summary. (line 623) +* posix, summary: Option Summary. (line 627) * preserve: Attributes. (line 122) -* preserve, summary: Option Summary. (line 601) +* preserve, summary: Option Summary. (line 630) * preserve-order: Same Order. (line 6) -* preserve-order, summary: Option Summary. (line 605) +* preserve-order, summary: Option Summary. (line 634) * preserve-permissions: Setting Access Permissions. (line 10) * preserve-permissions, short description: Attributes. (line 109) -* preserve-permissions, summary: Option Summary. (line 608) -* quote-chars, summary: Option Summary. (line 618) +* preserve-permissions, summary: Option Summary. (line 637) +* quote-chars, summary: Option Summary. (line 647) * quoting-style: quoting styles. (line 38) -* quoting-style, summary: Option Summary. (line 622) +* quoting-style, summary: Option Summary. (line 651) * read-full-records <1>: read full records. (line 6) * read-full-records: Reading. (line 6) * read-full-records, short description: Blocking Factor. (line 172) -* read-full-records, summary: Option Summary. (line 629) -* record-size, summary: Option Summary. (line 634) +* read-full-records, summary: Option Summary. (line 658) +* record-size, summary: Option Summary. (line 663) * recursion: recurse. (line 22) -* recursion, summary: Option Summary. (line 641) +* recursion, summary: Option Summary. (line 670) * recursive-unlink: Recursive Unlink. (line 6) -* recursive-unlink, summary: Option Summary. (line 645) +* recursive-unlink, summary: Option Summary. (line 674) * remove-files: remove files. (line 6) -* remove-files, summary: Option Summary. (line 650) -* restrict, summary: Option Summary. (line 654) -* rmt-command, summary: Option Summary. (line 659) +* remove-files, summary: Option Summary. (line 679) +* restrict, summary: Option Summary. (line 683) +* rmt-command, summary: Option Summary. (line 688) * rsh-command: Device. (line 73) -* rsh-command, summary: Option Summary. (line 663) +* rsh-command, summary: Option Summary. (line 692) * same-order: Same Order. (line 6) -* same-order, summary: Option Summary. (line 667) +* same-order, summary: Option Summary. (line 696) * same-owner: Attributes. (line 44) -* same-owner, summary: Option Summary. (line 675) +* same-owner, summary: Option Summary. (line 704) * same-permissions: Setting Access Permissions. (line 10) * same-permissions, short description: Attributes. (line 109) -* same-permissions, summary: Option Summary. (line 608) -* seek, summary: Option Summary. (line 684) +* same-permissions, summary: Option Summary. (line 637) +* seek, summary: Option Summary. (line 713) * show-defaults: defaults. (line 6) -* show-defaults, summary: Option Summary. (line 693) +* show-defaults, summary: Option Summary. (line 722) * show-omitted-dirs: verbose. (line 107) -* show-omitted-dirs, summary: Option Summary. (line 705) +* show-omitted-dirs, summary: Option Summary. (line 734) * show-snapshot-field-ranges: Snapshot Files. (line 113) -* show-snapshot-field-ranges, summary: Option Summary. (line 709) +* show-snapshot-field-ranges, summary: Option Summary. (line 738) * show-stored-names: list. (line 60) -* show-stored-names, summary: Option Summary. (line 714) +* show-stored-names, summary: Option Summary. (line 743) * show-transformed-names: transform. (line 45) -* show-transformed-names, summary: Option Summary. (line 714) +* show-transformed-names, summary: Option Summary. (line 743) * skip-old-files, introduced: Dealing with Old Files. (line 28) -* skip-old-files, summary: Option Summary. (line 722) +* skip-old-files, summary: Option Summary. (line 751) +* sort, summary: Option Summary. (line 763) * sparse: sparse. (line 22) -* sparse, summary: Option Summary. (line 734) +* sparse, summary: Option Summary. (line 782) * sparse-version: sparse. (line 57) -* sparse-version, summary: Option Summary. (line 739) +* sparse-version, summary: Option Summary. (line 787) * starting-file: Starting File. (line 6) -* starting-file, summary: Option Summary. (line 744) +* starting-file, summary: Option Summary. (line 792) * strip-components: transform. (line 25) -* strip-components, summary: Option Summary. (line 750) +* strip-components, summary: Option Summary. (line 798) * suffix: backup. (line 68) -* suffix, summary: Option Summary. (line 759) +* suffix, summary: Option Summary. (line 807) * tape-length: Multi-Volume Archives. (line 33) * tape-length, short description: Device. (line 96) -* tape-length, summary: Option Summary. (line 763) +* tape-length, summary: Option Summary. (line 811) * test-label: label. (line 35) -* test-label, summary: Option Summary. (line 772) +* test-label, summary: Option Summary. (line 820) * to-command: Writing to an External Program. (line 9) -* to-command, summary: Option Summary. (line 776) +* to-command, summary: Option Summary. (line 824) * to-stdout: Writing to Standard Output. (line 14) -* to-stdout, summary: Option Summary. (line 780) +* to-stdout, summary: Option Summary. (line 828) * totals: verbose. (line 46) -* totals, summary: Option Summary. (line 785) +* totals, summary: Option Summary. (line 833) * touch <1>: Attributes. (line 33) * touch: Data Modification Times. (line 15) -* touch, summary: Option Summary. (line 790) +* touch, summary: Option Summary. (line 838) * transform: transform. (line 74) -* transform, summary: Option Summary. (line 796) +* transform, summary: Option Summary. (line 844) * uncompress: gzip. (line 113) * uncompress, summary: Option Summary. (line 153) * ungzip: gzip. (line 91) -* ungzip, summary: Option Summary. (line 298) +* ungzip, summary: Option Summary. (line 316) * unlink-first: Unlink First. (line 6) * unlink-first, introduced: Dealing with Old Files. (line 52) -* unlink-first, summary: Option Summary. (line 816) +* unlink-first, summary: Option Summary. (line 864) * unquote: Selecting Archive Members. (line 39) -* unquote, summary: Option Summary. (line 822) +* unquote, summary: Option Summary. (line 870) * update <1>: how to update. (line 6) * update: update. (line 6) * update, summary: Operation Summary. (line 50) * usage: help. (line 53) * use-compress-program: gzip. (line 177) -* use-compress-program, summary: Option Summary. (line 826) -* utc, summary: Option Summary. (line 831) +* use-compress-program, summary: Option Summary. (line 874) +* utc, summary: Option Summary. (line 879) * verbose: verbose. (line 18) * verbose, introduced: verbose tutorial. (line 6) -* verbose, summary: Option Summary. (line 835) +* verbose, summary: Option Summary. (line 883) * verbose, using with --create: create verbose. (line 6) * verbose, using with --list: list. (line 30) * verify, short description: verify. (line 8) -* verify, summary: Option Summary. (line 842) +* verify, summary: Option Summary. (line 890) * verify, using with --create: verify. (line 24) * version: help. (line 6) -* version, summary: Option Summary. (line 847) +* version, summary: Option Summary. (line 895) * volno-file: Multi-Volume Archives. (line 79) -* volno-file, summary: Option Summary. (line 852) +* volno-file, summary: Option Summary. (line 900) * warning, explained: warnings. (line 12) -* warning, summary: Option Summary. (line 857) +* warning, summary: Option Summary. (line 905) * wildcards: controlling pattern-matching. (line 38) -* wildcards, summary: Option Summary. (line 862) +* wildcards, summary: Option Summary. (line 910) * wildcards-match-slash: controlling pattern-matching. (line 92) -* wildcards-match-slash, summary: Option Summary. (line 866) +* wildcards-match-slash, summary: Option Summary. (line 914) * xform: transform. (line 74) -* xform, summary: Option Summary. (line 796) +* xform, summary: Option Summary. (line 844) * xz: gzip. (line 96) -* xz, summary: Option Summary. (line 869) +* xz, summary: Option Summary. (line 917) diff --git a/doc/tar.info-3 b/doc/tar.info-3 index f6db655..0fdc5e3 100644 Binary files a/doc/tar.info-3 and b/doc/tar.info-3 differ diff --git a/doc/tar.texi b/doc/tar.texi index 9fde5a0..82c303d 100644 --- a/doc/tar.texi +++ b/doc/tar.texi @@ -2608,6 +2608,19 @@ tag file, but still dump the directory node itself. Exclude from dump any directory containing a valid cache directory tag file. @xref{exclude}. +@opsummary{exclude-ignore} +@item --exclude-ignore=@var{file} +Before dumping a directory, @command{tar} checks if it contains +@var{file}. If so, exclusion patterns are read from this file. +The patterns affect only the directory itself. @xref{exclude}. + +@opsummary{exclude-ignore-recursive} +@item --exclude-ignore-recursive=@var{file} +Before dumping a directory, @command{tar} checks if it contains +@var{file}. If so, exclusion patterns are read from this file. +The patterns affect the directory and all itssubdirectories. +@xref{exclude}. + @opsummary{exclude-tag} @item --exclude-tag=@var{file} @@ -2633,7 +2646,16 @@ Exclude from dump any directory containing file named @var{file}. Exclude from dump directories and files, that are internal for some widely used version control systems. -@xref{exclude,,exclude-vcs}. +@xref{exclude-vcs}. + +@opsummary{exclude-vcs-ignores} +@item --exclude-vcs-ignores +Exclude files that match patterns read from VCS-specific ignore +files. Supported files are: @file{.cvsignore}, @file{.gitignore}, +@file{.bzrignore}, and @file{.hgignore}. The semantics of each file +is the same as for the corresponding VCS, e.g. patterns read from +@file{.gitignore} affect the directory and all its subdirectories. +@xref{exclude-vcs-ignores}. @opsummary{file} @item --file=@var{archive} @@ -3086,6 +3108,19 @@ Used when creating an archive. Prevents @command{tar} from recursing into directories that are on different file systems from the current directory. +@opsummary{one-top-level} +@item --one-top-level[=@var{dir}] +Tells @command{tar} to create a new directory beneath the extraction directory +(or the one passed to @option{-C}) and use it to guard against +tarbombs. In the absence of @var{dir} argument, the name of the new directory +will be equal to the base name of the archive (file name minus the +archive suffix, if recognized). Any member names that do not begin +with that directory name (after +transformations from @option{--transform} and +@option{--strip-components}) will be prefixed with it. Recognized +file name suffixes are @samp{.tar}, and any compression suffixes +recognizable by @xref{--auto-compress}. + @opsummary{overwrite} @item --overwrite @@ -3306,6 +3341,27 @@ The @option{--warning=existing-file} option can be used together with this option to produce warning messages about existing old files (@pxref{warnings}). +@opsummary{sort} +@item --sort=@var{order} +Specify the directory sorting order when reading directories. +@var{Order} may be one of the following: + +@table @samp +@item none +No directory sorting is performed. This is the default. + +@item name +Sort the directory entries on name. The operating system may deliver +directory entries in a more or less random order, and sorting them +makes archive creation reproducible. + +@item inode +Sort the directory entries on inode number. Sorting directories on +inode number may reduce the amount of disk seek operations when +creating an archive for some file systems. + +@end table + @opsummary{sparse} @item --sparse @itemx -S @@ -3614,7 +3670,7 @@ successfully. For example, @w{@samp{tar --version}} might print: @smallexample tar (GNU tar) @value{VERSION} -Copyright (C) 2013 Free Software Foundation, Inc. +Copyright (C) 2013-2014 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later . This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. @@ -3961,10 +4017,10 @@ e.g.: @end smallexample The @samp{%s} and @samp{%u} in the above example are -@dfn{meta-characters}. The @samp{%s} meta-character is replaced with +@dfn{format specifiers}. The @samp{%s} specifier is replaced with the @dfn{type} of the checkpoint: @samp{write} or @samp{read} (or a corresponding translated version in locales other -than @acronym{POSIX}). The @samp{%u} meta-character is replaced with +than @acronym{POSIX}). The @samp{%u} specifier is replaced with the ordinal number of the checkpoint. Thus, the above example could produce the following output when used with the @option{--create} option: @@ -3975,7 +4031,54 @@ tar: Hit write checkpoint #20 tar: Hit write checkpoint #30 @end smallexample -Aside from meta-character expansion, the message string is subject to +The complete list of available format specifiers follows. Some of +them can take optional arguments. These arguments, if given, are +supplied in curly braces between the percent sign and the specifier +letter. + +@table @samp +@item %s +Print type of the checkpoint (@samp{write} or @samp{read}). + +@item %u +Print number of the checkpoint. + +@item %@{r,w,d@}T +Print number of bytes transferred so far and approximate transfer +speed. Optional arguments supply prefixes to be used before number +of bytes read, written and deleted, correspondingly. If absent, +they default to @samp{R}. @samp{W}, @samp{D}. Any or all of them can +be omitted, so, that e.g. @samp{%@{@}T} means to print corresponding +statistics without any prefixes. Any surplus arguments, if present, +are silently ignored. + +@example +$ @kbd{tar --delete -f f.tar --checkpoint-action=echo="#%u: %T" main.c} +tar: #1: R: 0 (0B, 0B/s),W: 0 (0B, 0B/s),D: 0 +tar: #2: R: 10240 (10KiB, 19MiB/s),W: 0 (0B, 0B/s),D: 10240 +@end example + +@noindent +See also the @samp{totals} action, described below. + +@item %@{@var{fmt}@}t +Output current local time using @var{fmt} as format for @command{strftime} +(@pxref{strftime, strftime,,strftime(3), strftime(3) man page}). The +@samp{@{@var{fmt}@}} part is optional. If not present, the default +format is @samp{%c}, i.e. the preferred date and time representation +for the current locale. + +@item %@{@var{n}@}* +Pad output with spaces to the @var{n}th column. If the +@samp{@{@var{n}@}} part is omitted, the current screen width +is assumed. + +@item %c +This is a shortcut for @samp{%@{%Y-%m-%d %H:%M:%S@}t: %ds, %@{read,wrote@}T%*\r}, +intended mainly for use with @samp{ttyout} action (see below). +@end table + +Aside from format expansion, the message string is subject to @dfn{unquoting}, during which the backslash @dfn{escape sequences} are replaced with their corresponding @acronym{ASCII} characters (@pxref{escape sequences}). E.g. the following action will produce an @@ -4002,9 +4105,23 @@ following action will print the checkpoint message at the same screen line, overwriting any previous message: @smallexample ---checkpoint-action="ttyout=\rHit %s checkpoint #%u" +--checkpoint-action="ttyout=Hit %s checkpoint #%u%*\r" +@end smallexample + +@noindent +Notice the use of @samp{%*} specifier to clear out any eventual +remains of the prior output line. As as more complex example, +consider this: + +@smallexample +--checkpoint-action=ttyout='%@{%Y-%m-%d %H:%M:%S@}t (%d sec): #%u, %T%*\r' @end smallexample +@noindent +This prints the current local time, number of seconds expired since +tar was started, the checkpoint ordinal number, transferred bytes and +average computed I/O speed. + @cindex @code{dot}, checkpoint action Another available checkpoint action is @samp{dot} (or @samp{.}). It instructs @command{tar} to print a single dot on the standard listing @@ -4019,6 +4136,12 @@ For compatibility with previous @GNUTAR{} versions, this action can be abbreviated by placing a dot in front of the checkpoint frequency, as shown in the previous section. +@cindex @code{totals}, checkpoint action +The @samp{totals} action prints the total number of bytes transferred +so far. The format of the data is the same as for the +@option{--totals} option (@pxref{totals}). See also @samp{%T} format +specifier of the @samp{echo} or @samp{ttyout} action. + @cindex @code{sleep}, checkpoint action Yet another action, @samp{sleep}, pauses @command{tar} for a specified amount of seconds. The following example will stop for 30 seconds at each @@ -7280,6 +7403,77 @@ which is difficult to catch using text editors. However, empty lines are OK. +@cindex VCS, excluding patterns from ignore files +@cindex VCS, ignore files +@cindex CVS, ignore files +@cindex Git, ignore files +@cindex Bazaar, ignore files +@cindex Mercurial, ignore files +When archiving directories that are under some version control system (VCS), +it is often convenient to read exclusion patterns from this VCS' +ignore files (e.g. @file{.cvsignore}, @file{.gitignore}, etc.) The +following options provide such possibilty: + +@table @option +@anchor{exclude-vcs-ignores} +@opindex exclude-vcs-ignores +@item --exclude-vcs-ignores +Before archiving a directory, see if it contains any of the following +files: @file{cvsignore}, @file{.gitignore}, @file{.bzrignore}, or +@file{.hgignore}. If so, read ignore patterns from these files. + +The patterns are treated much as the corresponding VCS would treat +them, i.e.: + +@table @file +@findex .cvsignore +@item .cvsignore +Contains shell-style globbing patterns that apply only to the +directory where this file resides. No comments are allowed in the +file. Empty lines are ignored. + +@findex .gitignore +@item .gitignore +Contains shell-style globbing patterns. Applies to the directory +where @file{.gitfile} is located and all its subdirectories. + +Any line beginning with a @samp{#} is a comment. Backslash escapes +the comment character. + +@findex .bzrignore +@item .bzrignore +Contains shell globbing-patterns and regular expressions (if prefixed +with @samp{RE:}@footnote{According to the Bazaar docs, +globbing-patterns are Korn-shell style and regular expressions are +perl-style. As of @GNUTAR{} version @value{VERSION}, these are +treated as shell-style globs and posix extended regexps. This will be +fixed in future releases.}. Patterns affect the directory and all its +subdirectories. + +Any line beginning with a @samp{#} is a comment. + +@findex .hgignore +@item .hgignore +Contains posix regular expressions@footnote{Support for perl-style +regexps will appear in future releases.}. The line @samp{syntax: +glob} switches to shell globbing patterns. The line @samp{syntax: +regexp} switches back. Comments begin with a @samp{#}. Patterns +affect the directory and all its subdirectories. +@end table + +@opindex exclude-ignore +@item --exclude-ignore=@var{file} +Before dumping a directory, @command{tar} checks if it contains +@var{file}. If so, exclusion patterns are read from this file. +The patterns affect only the directory itself. + +@opindex exclude-ignore-recursive +@item --exclude-ignore-recursive=@var{file} +Same as @option{--exclude-ignore}, except that the patterns read +affect both the directory where @var{file} resides and all its +subdirectories. +@end table + @table @option @cindex version control system, excluding files @cindex VCS, excluding files @@ -7292,6 +7486,7 @@ However, empty lines are OK. @cindex Arch, excluding files @cindex Mercurial, excluding files @cindex Darcs, excluding files +@anchor{exclude-vcs} @opindex exclude-vcs @item --exclude-vcs Exclude files and directories used by following version control @@ -9618,15 +9813,15 @@ free from many of @samp{v7}'s drawbacks. @subsection Ustar Archive Format @cindex ustar archive format -Archive format defined by @acronym{POSIX}.1-1988 specification is called -@code{ustar}. Although it is more flexible than the V7 format, it +The archive format defined by the @acronym{POSIX}.1-1988 specification is +called @code{ustar}. Although it is more flexible than the V7 format, it still has many restrictions (@pxref{Formats,ustar}, for the detailed description of @code{ustar} format). Along with V7 format, @code{ustar} format is a good choice for archives intended to be read with other implementations of @command{tar}. -To create archive in @code{ustar} format, use @option{--format=ustar} -option in conjunction with the @option{--create} (@option{-c}). +To create an archive in @code{ustar} format, use the @option{--format=ustar} +option in conjunction with @option{--create} (@option{-c}). @node gnu @subsection @acronym{GNU} and old @GNUTAR{} format @@ -9829,18 +10024,18 @@ same contents: SunOS and HP-UX @command{tar} fail to accept archives created using @GNUTAR{} and containing non-@acronym{ASCII} file names, that -is, file names having characters with the eight bit set, because they +is, file names having characters with the eighth bit set, because they use signed checksums, while @GNUTAR{} uses unsigned checksums while creating archives, as per @acronym{POSIX} standards. On -reading, @GNUTAR{} computes both checksums and -accepts any. It is somewhat worrying that a lot of people may go +reading, @GNUTAR{} computes both checksums and accepts either of them. +It is somewhat worrying that a lot of people may go around doing backup of their files using faulty (or at least non-standard) software, not learning about it until it's time to restore their missing files with an incompatible file extractor, or vice versa. -@GNUTAR{} computes checksums both ways, and accept -any on read, so @acronym{GNU} tar can read Sun tapes even with their +@GNUTAR{} computes checksums both ways, and accepts either of them +on read, so @acronym{GNU} tar can read Sun tapes even with their wrong checksums. @GNUTAR{} produces the standard checksum, however, raising incompatibilities with Sun. That is to say, @GNUTAR{} has not been modified to @@ -9855,7 +10050,7 @@ the default signing of @code{char}'s in their compiler. So they started computing checksums wrongly. When they later realized their mistake, they merely decided to stay compatible with it, and with themselves afterwards. Presumably, but I do not really know, HP-UX -has chosen that their @command{tar} archives to be compatible with Sun's. +has chosen their @command{tar} archives to be compatible with Sun's. The current standards do not favor Sun @command{tar} format. In any case, it now falls on the shoulders of SunOS and HP-UX users to get a @command{tar} able to read the good archives they receive. diff --git a/doc/texify.sed b/doc/texify.sed index faa8053..444c017 100644 --- a/doc/texify.sed +++ b/doc/texify.sed @@ -1,4 +1,4 @@ -# Copyright 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/doc/value.texi b/doc/value.texi index 7c26bf8..a4a9a68 100644 --- a/doc/value.texi +++ b/doc/value.texi @@ -1,5 +1,6 @@ @c This is part of GNU tar manual. -@c Copyright 1992, 1994-1997, 1999-2006, 2013 Free Software Foundation, Inc. +@c Copyright 1992, 1994-1997, 1999-2006, 2013-2014 Free Software +@c Foundation, Inc. @c See file tar.texi for copying conditions. @macro GNUTAR diff --git a/doc/version.texi b/doc/version.texi index 905e035..85496ec 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 24 September 2013 -@set UPDATED-MONTH September 2013 -@set EDITION 1.27 -@set VERSION 1.27 +@set UPDATED 22 July 2014 +@set UPDATED-MONTH July 2014 +@set EDITION 1.28 +@set VERSION 1.28 diff --git a/gnu/Makefile.in b/gnu/Makefile.in index 454337b..03eed58 100644 --- a/gnu/Makefile.in +++ b/gnu/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.6 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,7 @@ @SET_MAKE@ -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -35,28 +35,56 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl --lib=libgnu --source-base=gnu --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=lock --no-conditional-dependencies --no-libtool --macro-prefix=gl acl alloca argmatch argp argp-version-etc backupfile closeout configmake dirname error exclude exitfail extern-inline fchmodat fchownat fcntl-h fdopendir fdutimensat fileblocks fnmatch-gnu fseeko fstatat full-write futimens getline getopt-gnu getpagesize gettext gettime gitlog-to-changelog hash human inttostr inttypes lchown linkat localcharset manywarnings mkdirat mkdtemp mkfifoat modechange obstack openat parse-datetime priv-set progname quote quotearg readlinkat renameat root-uid rpmatch safe-read savedir selinux-at setenv snprintf stat-time stdbool stdint stpcpy strdup-posix strerror strtol strtoul symlinkat timespec unlinkat unlinkdir unlocked-io utimensat version-etc-fsf xalloc xalloc-die xgetcwd xstrtoumax xvasprintf +# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl --lib=libgnu --source-base=gnu --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=lock --no-conditional-dependencies --no-libtool --macro-prefix=gl acl alloca argmatch argp argp-version-etc backupfile closeout configmake dirname error exclude exitfail extern-inline faccessat fchmodat fchownat fcntl-h fdopendir fdutimensat fileblocks fnmatch-gnu fprintftime fseeko fstatat full-write futimens getline getopt-gnu getpagesize gettext gettime gitlog-to-changelog hash human inttostr inttypes lchown linkat localcharset manywarnings mkdirat mkdtemp mkfifoat modechange obstack openat parse-datetime posix_openpt priv-set progname ptsname quote quotearg readlinkat renameat root-uid rpmatch safe-read savedir selinux-at setenv snprintf stat-time stdbool stdint stpcpy strdup-posix strerror strtoimax strtol strtoul strtoumax symlinkat timespec unlinkat unlinkdir unlocked-io unlockpt utimensat version-etc-fsf xalloc xalloc-die xgetcwd xstrtoumax xvasprintf VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -74,18 +102,18 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/gnulib.mk \ +DIST_COMMON = $(srcdir)/gnulib.mk $(srcdir)/Makefile.in \ + $(srcdir)/Makefile.am alloca.c parse-datetime.c \ $(top_srcdir)/build-aux/depcomp $(top_srcdir)/build-aux/ylwrap \ - alloca.c parse-datetime.c + $(noinst_HEADERS) @LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__append_1 = uniwidth/width.c subdir = gnu ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ - $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/alloca.m4 \ - $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/backupfile.m4 \ - $(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/btowc.m4 \ - $(top_srcdir)/m4/canonicalize.m4 \ + $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/acl.m4 \ + $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argp.m4 \ + $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \ + $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/chown.m4 \ $(top_srcdir)/m4/clock_time.m4 \ $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ @@ -97,9 +125,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup.m4 \ $(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/eealloc.m4 \ $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/errno_h.m4 \ - $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exponentd.m4 \ - $(top_srcdir)/m4/extensions.m4 \ - $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fchdir.m4 \ + $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/euidaccess.m4 \ + $(top_srcdir)/m4/exponentd.m4 $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/extern-inline.m4 \ + $(top_srcdir)/m4/faccessat.m4 $(top_srcdir)/m4/fchdir.m4 \ $(top_srcdir)/m4/fchmodat.m4 $(top_srcdir)/m4/fchownat.m4 \ $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl.m4 \ $(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fdopendir.m4 \ @@ -111,19 +140,21 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/m4/getcwd-path-max.m4 $(top_srcdir)/m4/getcwd.m4 \ $(top_srcdir)/m4/getdelim.m4 $(top_srcdir)/m4/getdtablesize.m4 \ - $(top_srcdir)/m4/getline.m4 $(top_srcdir)/m4/getopt.m4 \ - $(top_srcdir)/m4/getpagesize.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gettime.m4 $(top_srcdir)/m4/gettimeofday.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/human.m4 \ + $(top_srcdir)/m4/getgroups.m4 $(top_srcdir)/m4/getline.m4 \ + $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/getpagesize.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettime.m4 \ + $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ + $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 \ + $(top_srcdir)/m4/group-member.m4 $(top_srcdir)/m4/human.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/include_next.m4 \ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \ $(top_srcdir)/m4/inttostr.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ - $(top_srcdir)/m4/iswblank.m4 $(top_srcdir)/m4/langinfo_h.m4 \ - $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lchown.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/isatty.m4 $(top_srcdir)/m4/iswblank.m4 \ + $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ + $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ $(top_srcdir)/m4/link-follow.m4 $(top_srcdir)/m4/link.m4 \ $(top_srcdir)/m4/linkat.m4 $(top_srcdir)/m4/localcharset.m4 \ @@ -149,19 +180,21 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/paxutils.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf.m4 \ - $(top_srcdir)/m4/priv-set.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ - $(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \ - $(top_srcdir)/m4/read.m4 $(top_srcdir)/m4/readdir.m4 \ - $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/readlinkat.m4 \ - $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.m4 \ - $(top_srcdir)/m4/rename.m4 $(top_srcdir)/m4/renameat.m4 \ - $(top_srcdir)/m4/rewinddir.m4 $(top_srcdir)/m4/rmdir.m4 \ - $(top_srcdir)/m4/rmt.m4 $(top_srcdir)/m4/rpmatch.m4 \ - $(top_srcdir)/m4/rtapelib.m4 $(top_srcdir)/m4/safe-read.m4 \ - $(top_srcdir)/m4/safe-write.m4 $(top_srcdir)/m4/save-cwd.m4 \ - $(top_srcdir)/m4/savedir.m4 $(top_srcdir)/m4/secure_getenv.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix_openpt.m4 \ + $(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/priv-set.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/ptsname.m4 \ + $(top_srcdir)/m4/ptsname_r.m4 $(top_srcdir)/m4/quote.m4 \ + $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/raise.m4 \ + $(top_srcdir)/m4/rawmemchr.m4 $(top_srcdir)/m4/read.m4 \ + $(top_srcdir)/m4/readdir.m4 $(top_srcdir)/m4/readlink.m4 \ + $(top_srcdir)/m4/readlinkat.m4 $(top_srcdir)/m4/realloc.m4 \ + $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rename.m4 \ + $(top_srcdir)/m4/renameat.m4 $(top_srcdir)/m4/rewinddir.m4 \ + $(top_srcdir)/m4/rmdir.m4 $(top_srcdir)/m4/rmt.m4 \ + $(top_srcdir)/m4/rpmatch.m4 $(top_srcdir)/m4/rtapelib.m4 \ + $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/safe-write.m4 \ + $(top_srcdir)/m4/save-cwd.m4 $(top_srcdir)/m4/savedir.m4 \ + $(top_srcdir)/m4/secure_getenv.m4 \ $(top_srcdir)/m4/selinux-context-h.m4 \ $(top_srcdir)/m4/selinux-selinux-h.m4 \ $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/signal_h.m4 \ @@ -174,20 +207,23 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \ $(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \ - $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strings_h.m4 $(top_srcdir)/m4/strndup.m4 \ - $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strtol.m4 \ - $(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \ - $(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/symlink.m4 \ - $(top_srcdir)/m4/symlinkat.m4 $(top_srcdir)/m4/sys_socket_h.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strftime.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \ + $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ + $(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \ + $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \ + $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \ + $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/symlinkat.m4 \ + $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sysexits.m4 \ $(top_srcdir)/m4/system.m4 $(top_srcdir)/m4/tempname.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ - $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \ - $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkat.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \ + $(top_srcdir)/m4/ttyname_r.m4 $(top_srcdir)/m4/unistd-safer.m4 \ + $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ + $(top_srcdir)/m4/unlinkat.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/unlockpt.m4 \ $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utimens.m4 \ $(top_srcdir)/m4/utimensat.m4 $(top_srcdir)/m4/utimes.m4 \ $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ @@ -224,22 +260,22 @@ am__libgnu_a_SOURCES_DIST = copy-acl.c set-acl.c allocator.c \ cloexec.c close-stream.c closeout.c opendir-safer.c dirname.c \ basename.c dirname-lgpl.c basename-lgpl.c stripslash.c \ exclude.c exitfail.c chmodat.c chownat.c fd-hook.c \ - fdutimensat.c filenamecat-lgpl.c full-write.h full-write.c \ - gettext.h gettime.c hash.c human.c imaxtostr.c inttostr.c \ - offtostr.c uinttostr.c umaxtostr.c localcharset.h \ + fdutimensat.c filenamecat-lgpl.c fprintftime.c full-write.h \ + full-write.c gettext.h gettime.c hash.c human.c imaxtostr.c \ + inttostr.c offtostr.c uinttostr.c umaxtostr.c localcharset.h \ localcharset.c malloca.c mbchar.c mbscasecmp.c mbuiter.h \ mbuiter.c modechange.c openat-die.c parse-datetime.y \ priv-set.c progname.h progname.c acl-errno-valid.c \ file-has-acl.c qcopy-acl.c qset-acl.c quotearg.c safe-read.c \ safe-write.c save-cwd.c savedir.c se-context.in.h \ se-selinux.in.h se-context.c se-selinux.c size_max.h \ - stat-time.c statat.c strnlen1.h strnlen1.c tempname.c \ - timespec.c unistd.c dup-safer.c fd-safer.c pipe-safer.c \ - uniwidth/width.c unlinkdir.c utimens.c version-etc.h \ - version-etc.c version-etc-fsf.c wctype-h.c xmalloc.c \ - xalloc-die.c xgetcwd.c xsize.h xsize.c xstrndup.h xstrndup.c \ - xstrtol.c xstrtoul.c xstrtol-error.c xstrtoumax.c xvasprintf.h \ - xvasprintf.c xasprintf.c + stat-time.c statat.c strftime.c strnlen1.h strnlen1.c \ + tempname.c timespec.c unistd.c dup-safer.c fd-safer.c \ + pipe-safer.c uniwidth/width.c unlinkdir.c utimens.c \ + version-etc.h version-etc.c version-etc-fsf.c wctype-h.c \ + xmalloc.c xalloc-die.c xgetcwd.c xsize.h xsize.c xstrndup.h \ + xstrndup.c xstrtol.c xstrtoul.c xstrtol-error.c xstrtoumax.c \ + xvasprintf.h xvasprintf.c xasprintf.c am__dirstamp = $(am__leading_dot)dirstamp @LIBUNISTRING_COMPILE_UNIWIDTH_WIDTH_TRUE@am__objects_1 = uniwidth/width.$(OBJEXT) am_libgnu_a_OBJECTS = copy-acl.$(OBJEXT) set-acl.$(OBJEXT) \ @@ -257,26 +293,27 @@ am_libgnu_a_OBJECTS = copy-acl.$(OBJEXT) set-acl.$(OBJEXT) \ stripslash.$(OBJEXT) exclude.$(OBJEXT) exitfail.$(OBJEXT) \ chmodat.$(OBJEXT) chownat.$(OBJEXT) fd-hook.$(OBJEXT) \ fdutimensat.$(OBJEXT) filenamecat-lgpl.$(OBJEXT) \ - full-write.$(OBJEXT) gettime.$(OBJEXT) hash.$(OBJEXT) \ - human.$(OBJEXT) imaxtostr.$(OBJEXT) inttostr.$(OBJEXT) \ - offtostr.$(OBJEXT) uinttostr.$(OBJEXT) umaxtostr.$(OBJEXT) \ - localcharset.$(OBJEXT) malloca.$(OBJEXT) mbchar.$(OBJEXT) \ - mbscasecmp.$(OBJEXT) mbuiter.$(OBJEXT) modechange.$(OBJEXT) \ - openat-die.$(OBJEXT) parse-datetime.$(OBJEXT) \ - priv-set.$(OBJEXT) progname.$(OBJEXT) \ + fprintftime.$(OBJEXT) full-write.$(OBJEXT) gettime.$(OBJEXT) \ + hash.$(OBJEXT) human.$(OBJEXT) imaxtostr.$(OBJEXT) \ + inttostr.$(OBJEXT) offtostr.$(OBJEXT) uinttostr.$(OBJEXT) \ + umaxtostr.$(OBJEXT) localcharset.$(OBJEXT) malloca.$(OBJEXT) \ + mbchar.$(OBJEXT) mbscasecmp.$(OBJEXT) mbuiter.$(OBJEXT) \ + modechange.$(OBJEXT) openat-die.$(OBJEXT) \ + parse-datetime.$(OBJEXT) priv-set.$(OBJEXT) progname.$(OBJEXT) \ acl-errno-valid.$(OBJEXT) file-has-acl.$(OBJEXT) \ qcopy-acl.$(OBJEXT) qset-acl.$(OBJEXT) quotearg.$(OBJEXT) \ safe-read.$(OBJEXT) safe-write.$(OBJEXT) save-cwd.$(OBJEXT) \ savedir.$(OBJEXT) se-context.$(OBJEXT) se-selinux.$(OBJEXT) \ - stat-time.$(OBJEXT) statat.$(OBJEXT) strnlen1.$(OBJEXT) \ - tempname.$(OBJEXT) timespec.$(OBJEXT) unistd.$(OBJEXT) \ - dup-safer.$(OBJEXT) fd-safer.$(OBJEXT) pipe-safer.$(OBJEXT) \ - $(am__objects_1) unlinkdir.$(OBJEXT) utimens.$(OBJEXT) \ - version-etc.$(OBJEXT) version-etc-fsf.$(OBJEXT) \ - wctype-h.$(OBJEXT) xmalloc.$(OBJEXT) xalloc-die.$(OBJEXT) \ - xgetcwd.$(OBJEXT) xsize.$(OBJEXT) xstrndup.$(OBJEXT) \ - xstrtol.$(OBJEXT) xstrtoul.$(OBJEXT) xstrtol-error.$(OBJEXT) \ - xstrtoumax.$(OBJEXT) xvasprintf.$(OBJEXT) xasprintf.$(OBJEXT) + stat-time.$(OBJEXT) statat.$(OBJEXT) strftime.$(OBJEXT) \ + strnlen1.$(OBJEXT) tempname.$(OBJEXT) timespec.$(OBJEXT) \ + unistd.$(OBJEXT) dup-safer.$(OBJEXT) fd-safer.$(OBJEXT) \ + pipe-safer.$(OBJEXT) $(am__objects_1) unlinkdir.$(OBJEXT) \ + utimens.$(OBJEXT) version-etc.$(OBJEXT) \ + version-etc-fsf.$(OBJEXT) wctype-h.$(OBJEXT) xmalloc.$(OBJEXT) \ + xalloc-die.$(OBJEXT) xgetcwd.$(OBJEXT) xsize.$(OBJEXT) \ + xstrndup.$(OBJEXT) xstrtol.$(OBJEXT) xstrtoul.$(OBJEXT) \ + xstrtol-error.$(OBJEXT) xstrtoumax.$(OBJEXT) \ + xvasprintf.$(OBJEXT) xasprintf.$(OBJEXT) libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS) LTLIBRARIES = $(noinst_LTLIBRARIES) AM_V_P = $(am__v_P_@AM_V@) @@ -317,13 +354,14 @@ am__v_YACC_1 = YLWRAP = $(top_srcdir)/build-aux/ylwrap SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES) DIST_SOURCES = $(am__libgnu_a_SOURCES_DIST) $(EXTRA_libgnu_a_SOURCES) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -332,9 +370,29 @@ am__can_run_installinfo = \ HEADERS = $(noinst_HEADERS) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -931,6 +989,7 @@ LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@ LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ LIB_ACL = @LIB_ACL@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_EACCESS = @LIB_EACCESS@ LIB_SELINUX = @LIB_SELINUX@ LIB_SETSOCKOPT = @LIB_SETSOCKOPT@ LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ @@ -1046,11 +1105,13 @@ REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ +REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ +REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ @@ -1059,6 +1120,7 @@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ REPLACE_LOCALECONV = @REPLACE_LOCALECONV@ +REPLACE_LOCALTIME = @REPLACE_LOCALTIME@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ REPLACE_LSTAT = @REPLACE_LSTAT@ @@ -1125,6 +1187,7 @@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOD = @REPLACE_STRTOD@ REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ +REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ @@ -1152,6 +1215,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ RSH = @RSH@ +SED = @SED@ SELINUX_CONTEXT_H = @SELINUX_CONTEXT_H@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -1189,6 +1253,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -1233,6 +1298,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1264,38 +1330,42 @@ EXTRA_DIST = alloca.c alloca.in.h allocator.h areadlink.h areadlink.h \ close.c close-stream.h closedir.c dirent-private.h closeout.h \ dirent.in.h dirent--.h dirent-safer.h dirfd.c stripslash.c \ dirname.h dosname.h dup.c dup2.c errno.in.h error.c error.h \ - exclude.h exitfail.h fchdir.c at-func.c fchmodat.c at-func.c \ - fchownat.c fcntl.c fcntl.in.h fd-hook.h fdopendir.c utimens.h \ - fileblocks.c filename.h filenamecat.h float.c float.in.h \ - itold.c fnmatch.c fnmatch.in.h fnmatch_loop.c fpending.c \ - fpending.h fseek.c fseeko.c stdio-impl.h fstat.c at-func.c \ + euidaccess.c exclude.h exitfail.h at-func.c faccessat.c \ + fchdir.c at-func.c fchmodat.c at-func.c fchownat.c fcntl.c \ + fcntl.in.h fd-hook.h fdopendir.c utimens.h fileblocks.c \ + filename.h filenamecat.h float.c float.in.h itold.c fnmatch.c \ + fnmatch.in.h fnmatch_loop.c fpending.c fpending.h \ + fprintftime.h fseek.c fseeko.c stdio-impl.h fstat.c at-func.c \ fstatat.c futimens.c getcwd.c getcwd-lgpl.c getdelim.c \ - getdtablesize.c getline.c getopt.c getopt.in.h getopt1.c \ - getopt_int.h getpagesize.c \ + getdtablesize.c getgroups.c getline.c getopt.c getopt.in.h \ + getopt1.c getopt_int.h getpagesize.c \ $(top_srcdir)/build-aux/config.rpath gettimeofday.c \ - $(top_srcdir)/build-aux/gitlog-to-changelog hash.h \ + $(top_srcdir)/build-aux/gitlog-to-changelog \ + $(top_srcdir)/build-aux/git-log-fix group-member.c hash.h \ $(top_srcdir)/build-aux/config.rpath human.h intprops.h \ - anytostr.c inttostr.h inttypes.in.h iswblank.c langinfo.in.h \ - lchown.c link.c at-func2.c linkat.c config.charset ref-add.sin \ - ref-del.sin locale.in.h localeconv.c lseek.c lstat.c malloc.c \ - malloc.c malloca.h malloca.valgrind mbchar.h mbrtowc.c \ - mbsinit.c mbsrtowcs-impl.h mbsrtowcs-state.c mbsrtowcs.c \ - mbtowc-impl.h mbtowc.c memchr.c memchr.valgrind mempcpy.c \ - memrchr.c mkdir.c at-func.c mkdirat.c mkdtemp.c mkfifo.c \ - at-func.c mkfifoat.c mknodat.c mknod.c mktime-internal.h \ - mktime.c modechange.h msvc-inval.c msvc-inval.h msvc-nothrow.c \ - msvc-nothrow.h nl_langinfo.c obstack.c obstack.h open.c \ - openat.c openat.h dirent-private.h opendir.c parse-datetime.c \ - parse-datetime.h pathmax.h priv-set.h acl-internal.h acl.h \ - acl_entries.c quote.h quote.h quotearg.h raise.c rawmemchr.c \ - rawmemchr.valgrind read.c dirent-private.h readdir.c \ - readlink.c at-func.c readlinkat.c realloc.c regcomp.c regex.c \ - regex.h regex_internal.c regex_internal.h regexec.c rename.c \ - at-func2.c renameat.c dirent-private.h rewinddir.c rmdir.c \ - root-uid.h rpmatch.c safe-read.h safe-read.c safe-write.h \ - same-inode.h save-cwd.h savedir.h secure_getenv.c at-func.c \ - selinux-at.c selinux-at.h getfilecon.c setenv.c signal.in.h \ - sleep.c $(top_srcdir)/build-aux/snippet/_Noreturn.h \ + anytostr.c inttostr.h inttypes.in.h isatty.c iswblank.c \ + langinfo.in.h lchown.c link.c at-func2.c linkat.c \ + config.charset ref-add.sin ref-del.sin locale.in.h \ + localeconv.c lseek.c lstat.c malloc.c malloc.c malloca.h \ + malloca.valgrind mbchar.h mbrtowc.c mbsinit.c mbsrtowcs-impl.h \ + mbsrtowcs-state.c mbsrtowcs.c mbtowc-impl.h mbtowc.c memchr.c \ + memchr.valgrind mempcpy.c memrchr.c mkdir.c at-func.c \ + mkdirat.c mkdtemp.c mkfifo.c at-func.c mkfifoat.c mknodat.c \ + mknod.c mktime-internal.h mktime.c modechange.h msvc-inval.c \ + msvc-inval.h msvc-nothrow.c msvc-nothrow.h nl_langinfo.c \ + obstack.c obstack.h open.c openat.c openat.h dirent-private.h \ + opendir.c parse-datetime.c parse-datetime.h pathmax.h \ + posix_openpt.c priv-set.h ptsname.c ptsname_r.c acl-internal.h \ + acl.h acl_entries.c quote.h quote.h quotearg.h raise.c \ + rawmemchr.c rawmemchr.valgrind read.c dirent-private.h \ + readdir.c readlink.c at-func.c readlinkat.c realloc.c \ + regcomp.c regex.c regex.h regex_internal.c regex_internal.h \ + regexec.c rename.c at-func2.c renameat.c dirent-private.h \ + rewinddir.c rmdir.c root-uid.h rpmatch.c safe-read.h \ + safe-read.c safe-write.h same-inode.h save-cwd.h savedir.h \ + secure_getenv.c at-func.c selinux-at.c selinux-at.h \ + getfilecon.c setenv.c signal.in.h sleep.c \ + $(top_srcdir)/build-aux/snippet/_Noreturn.h \ $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ $(top_srcdir)/build-aux/snippet/c++defs.h \ $(top_srcdir)/build-aux/snippet/unused-parameter.h \ @@ -1304,19 +1374,20 @@ EXTRA_DIST = alloca.c alloca.in.h allocator.h areadlink.h areadlink.h \ stdbool.in.h stddef.in.h stdint.in.h stdio.in.h stdlib.in.h \ stpcpy.c strcasecmp.c strncasecmp.c strchrnul.c \ strchrnul.valgrind strdup.c streq.h strerror.c \ - strerror-override.c strerror-override.h string.in.h \ - strings.in.h strndup.c strnlen.c strtol.c strtol.c strtoul.c \ - strtol.c strtoul.c strtoull.c strtoimax.c strtoumax.c \ - symlink.c at-func.c symlinkat.c sys_stat.in.h sys_time.in.h \ - sys_types.in.h sysexits.in.h tempname.h time.in.h time_r.c \ - timespec.h unistd.in.h unistd--.h unistd-safer.h unitypes.in.h \ + strerror-override.c strerror-override.h strftime.h string.in.h \ + strings.in.h strndup.c strnlen.c strtoimax.c strtol.c strtol.c \ + strtoll.c strtol.c strtoul.c strtol.c strtoul.c strtoull.c \ + strtoimax.c strtoumax.c symlink.c at-func.c symlinkat.c \ + sys_stat.in.h sys_time.in.h sys_types.in.h sysexits.in.h \ + tempname.h time.in.h time_r.c timespec.h ttyname_r.c \ + unistd.in.h unistd--.h unistd-safer.h unitypes.in.h \ localcharset.h uniwidth.in.h uniwidth/cjk.h unlink.c at-func.c \ - unlinkat.c unlinkdir.h unlocked-io.h unsetenv.c utimens.h \ - at-func.c utimensat.c asnprintf.c float+.h printf-args.c \ - printf-args.h printf-parse.c printf-parse.h vasnprintf.c \ - vasnprintf.h asprintf.c vasprintf.c verify.h vsnprintf.c \ - wchar.in.h wcrtomb.c wctype.in.h wcwidth.c write.c xalloc.h \ - xalloc-oversized.h xgetcwd.h xstrtol.h xalloc.h + unlinkat.c unlinkdir.h unlocked-io.h unlockpt.c unsetenv.c \ + utimens.h at-func.c utimensat.c asnprintf.c float+.h \ + printf-args.c printf-args.h printf-parse.c printf-parse.h \ + vasnprintf.c vasnprintf.h asprintf.c vasprintf.c verify.h \ + vsnprintf.c wchar.in.h wcrtomb.c wctype.in.h wcwidth.c write.c \ + xalloc.h xalloc-oversized.h xgetcwd.h xstrtol.h xalloc.h # The BUILT_SOURCES created by this Makefile snippet are not used via #include # statements but through direct file reference. Therefore this snippet must be @@ -1376,51 +1447,59 @@ libgnu_a_SOURCES = copy-acl.c set-acl.c allocator.c areadlink.c \ close-stream.c closeout.c opendir-safer.c dirname.c basename.c \ dirname-lgpl.c basename-lgpl.c stripslash.c exclude.c \ exitfail.c chmodat.c chownat.c fd-hook.c fdutimensat.c \ - filenamecat-lgpl.c full-write.h full-write.c gettext.h \ - gettime.c hash.c human.c imaxtostr.c inttostr.c offtostr.c \ - uinttostr.c umaxtostr.c localcharset.h localcharset.c \ - malloca.c mbchar.c mbscasecmp.c mbuiter.h mbuiter.c \ - modechange.c openat-die.c parse-datetime.y priv-set.c \ - progname.h progname.c acl-errno-valid.c file-has-acl.c \ - qcopy-acl.c qset-acl.c quotearg.c safe-read.c safe-write.c \ - save-cwd.c savedir.c se-context.in.h se-selinux.in.h \ - se-context.c se-selinux.c size_max.h stat-time.c statat.c \ - strnlen1.h strnlen1.c tempname.c timespec.c unistd.c \ - dup-safer.c fd-safer.c pipe-safer.c $(am__append_1) \ - unlinkdir.c utimens.c version-etc.h version-etc.c \ - version-etc-fsf.c wctype-h.c xmalloc.c xalloc-die.c xgetcwd.c \ - xsize.h xsize.c xstrndup.h xstrndup.c xstrtol.c xstrtoul.c \ - xstrtol-error.c xstrtoumax.c xvasprintf.h xvasprintf.c \ - xasprintf.c + filenamecat-lgpl.c fprintftime.c full-write.h full-write.c \ + gettext.h gettime.c hash.c human.c imaxtostr.c inttostr.c \ + offtostr.c uinttostr.c umaxtostr.c localcharset.h \ + localcharset.c malloca.c mbchar.c mbscasecmp.c mbuiter.h \ + mbuiter.c modechange.c openat-die.c parse-datetime.y \ + priv-set.c progname.h progname.c acl-errno-valid.c \ + file-has-acl.c qcopy-acl.c qset-acl.c quotearg.c safe-read.c \ + safe-write.c save-cwd.c savedir.c se-context.in.h \ + se-selinux.in.h se-context.c se-selinux.c size_max.h \ + stat-time.c statat.c strftime.c strnlen1.h strnlen1.c \ + tempname.c timespec.c unistd.c dup-safer.c fd-safer.c \ + pipe-safer.c $(am__append_1) unlinkdir.c utimens.c \ + version-etc.h version-etc.c version-etc-fsf.c wctype-h.c \ + xmalloc.c xalloc-die.c xgetcwd.c xsize.h xsize.c xstrndup.h \ + xstrndup.c xstrtol.c xstrtoul.c xstrtol-error.c xstrtoumax.c \ + xvasprintf.h xvasprintf.c xasprintf.c libgnu_a_LIBADD = $(gl_LIBOBJS) @ALLOCA@ libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) @ALLOCA@ EXTRA_libgnu_a_SOURCES = alloca.c at-func.c openat-proc.c btowc.c \ canonicalize-lgpl.c chdir-long.c chown.c fchown-stub.c close.c \ - closedir.c dirfd.c stripslash.c dup.c dup2.c error.c fchdir.c \ - at-func.c fchmodat.c at-func.c fchownat.c fcntl.c fdopendir.c \ + closedir.c dirfd.c stripslash.c dup.c dup2.c error.c \ + euidaccess.c at-func.c faccessat.c fchdir.c at-func.c \ + fchmodat.c at-func.c fchownat.c fcntl.c fdopendir.c \ fileblocks.c float.c itold.c fnmatch.c fnmatch_loop.c \ fpending.c fseek.c fseeko.c fstat.c at-func.c fstatat.c \ futimens.c getcwd.c getcwd-lgpl.c getdelim.c getdtablesize.c \ - getline.c getopt.c getopt1.c getpagesize.c gettimeofday.c \ - anytostr.c iswblank.c lchown.c link.c at-func2.c linkat.c \ - localeconv.c lseek.c lstat.c malloc.c malloc.c mbrtowc.c \ - mbsinit.c mbsrtowcs-state.c mbsrtowcs.c mbtowc.c memchr.c \ - mempcpy.c memrchr.c mkdir.c at-func.c mkdirat.c mkdtemp.c \ - mkfifo.c at-func.c mkfifoat.c mknodat.c mknod.c mktime.c \ - msvc-inval.c msvc-nothrow.c nl_langinfo.c obstack.c open.c \ - openat.c opendir.c acl_entries.c raise.c rawmemchr.c read.c \ - readdir.c readlink.c at-func.c readlinkat.c realloc.c \ - regcomp.c regex.c regex_internal.c regexec.c rename.c \ - at-func2.c renameat.c rewinddir.c rmdir.c rpmatch.c \ - safe-read.c secure_getenv.c at-func.c selinux-at.c \ + getgroups.c getline.c getopt.c getopt1.c getpagesize.c \ + gettimeofday.c group-member.c anytostr.c isatty.c iswblank.c \ + lchown.c link.c at-func2.c linkat.c localeconv.c lseek.c \ + lstat.c malloc.c malloc.c mbrtowc.c mbsinit.c \ + mbsrtowcs-state.c mbsrtowcs.c mbtowc.c memchr.c mempcpy.c \ + memrchr.c mkdir.c at-func.c mkdirat.c mkdtemp.c mkfifo.c \ + at-func.c mkfifoat.c mknodat.c mknod.c mktime.c msvc-inval.c \ + msvc-nothrow.c nl_langinfo.c obstack.c open.c openat.c \ + opendir.c posix_openpt.c ptsname.c ptsname_r.c acl_entries.c \ + raise.c rawmemchr.c read.c readdir.c readlink.c at-func.c \ + readlinkat.c realloc.c regcomp.c regex.c regex_internal.c \ + regexec.c rename.c at-func2.c renameat.c rewinddir.c rmdir.c \ + rpmatch.c safe-read.c secure_getenv.c at-func.c selinux-at.c \ getfilecon.c setenv.c sleep.c snprintf.c stat.c stpcpy.c \ strcasecmp.c strncasecmp.c strchrnul.c strdup.c strerror.c \ - strerror-override.c strndup.c strnlen.c strtol.c strtol.c \ - strtoul.c strtol.c strtoul.c strtoull.c strtoimax.c \ - strtoumax.c symlink.c at-func.c symlinkat.c time_r.c unlink.c \ - at-func.c unlinkat.c unsetenv.c at-func.c utimensat.c \ - asnprintf.c printf-args.c printf-parse.c vasnprintf.c \ - asprintf.c vasprintf.c vsnprintf.c wcrtomb.c wcwidth.c write.c + strerror-override.c strndup.c strnlen.c strtoimax.c strtol.c \ + strtol.c strtoll.c strtol.c strtoul.c strtol.c strtoul.c \ + strtoull.c strtoimax.c strtoumax.c symlink.c at-func.c \ + symlinkat.c time_r.c ttyname_r.c unlink.c at-func.c unlinkat.c \ + unlockpt.c unsetenv.c at-func.c utimensat.c asnprintf.c \ + printf-args.c printf-parse.c vasnprintf.c asprintf.c \ + vasprintf.c vsnprintf.c wcrtomb.c wcwidth.c write.c + +# Use this preprocessor expression to decide whether #include_next works. +# Do not rely on a 'configure'-time test for this, since the expression +# might appear in an installed header, which is used by some other compiler. +HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER) charset_alias = $(DESTDIR)$(libdir)/charset.alias charset_tmp = $(DESTDIR)$(libdir)/charset.tmp @@ -1479,6 +1558,7 @@ uniwidth/$(DEPDIR)/$(am__dirstamp): @: > uniwidth/$(DEPDIR)/$(am__dirstamp) uniwidth/width.$(OBJEXT): uniwidth/$(am__dirstamp) \ uniwidth/$(DEPDIR)/$(am__dirstamp) + libgnu.a: $(libgnu_a_OBJECTS) $(libgnu_a_DEPENDENCIES) $(EXTRA_libgnu_a_DEPENDENCIES) $(AM_V_at)-rm -f libgnu.a $(AM_V_AR)$(libgnu_a_AR) libgnu.a $(libgnu_a_OBJECTS) $(libgnu_a_LIBADD) @@ -1553,8 +1633,10 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dup.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dup2.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/euidaccess.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exclude.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exitfail.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/faccessat.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fchdir.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fchmodat.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fchown-stub.Po@am__quote@ @@ -1571,6 +1653,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fnmatch.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fnmatch_loop.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fpending.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fprintftime.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fseek.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fseeko.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstat.Po@am__quote@ @@ -1582,16 +1665,19 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdelim.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getdtablesize.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getfilecon.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getgroups.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getline.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getpagesize.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gettime.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gettimeofday.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/group-member.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/human.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imaxtostr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inttostr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/isatty.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iswblank.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/itold.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lchown.Po@am__quote@ @@ -1636,10 +1722,13 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/opendir.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse-datetime.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pipe-safer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/posix_openpt.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printf-args.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/printf-parse.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/priv-set.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/progname.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptsname.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ptsname_r.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qcopy-acl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qset-acl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quotearg.Po@am__quote@ @@ -1680,6 +1769,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strdup.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror-override.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strerror.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strftime.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stripslash.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strncasecmp.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strndup.Po@am__quote@ @@ -1687,6 +1777,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnlen1.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtoimax.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtol.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtoll.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtoul.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtoull.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strtoumax.Po@am__quote@ @@ -1695,12 +1786,14 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tempname.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/time_r.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timespec.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ttyname_r.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uinttostr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/umaxtostr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unistd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlink.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlinkat.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlinkdir.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlockpt.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unsetenv.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utimens.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utimensat.Po@am__quote@ @@ -1751,14 +1844,13 @@ distclean-compile: # (1) if the variable is set in 'config.status', edit 'config.status' # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -1779,31 +1871,13 @@ $(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): if test "$$dot_seen" = "no"; then \ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done -cscopelist-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ - done -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -1819,12 +1893,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1836,15 +1905,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1853,9 +1918,10 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -2042,14 +2108,12 @@ ps-am: uninstall-am: uninstall-local -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check \ - cscopelist-recursive ctags-recursive install install-am \ - install-strip tags-recursive +.MAKE: $(am__recursive_targets) all check install install-am \ + install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am all-local check check-am clean clean-generic \ - clean-noinstLIBRARIES clean-noinstLTLIBRARIES cscopelist \ - cscopelist-recursive ctags ctags-recursive distclean \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \ + check check-am clean clean-generic clean-noinstLIBRARIES \ + clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \ distclean-compile distclean-generic distclean-tags distdir dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dvi install-dvi-am \ @@ -2059,8 +2123,8 @@ uninstall-am: uninstall-local install-strip installcheck installcheck-am installdirs \ installdirs-am maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-local pdf pdf-am ps ps-am tags tags-recursive \ - uninstall uninstall-am uninstall-local + mostlyclean-local pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-local # We need the following in order to create when the system @@ -2075,7 +2139,7 @@ uninstall-am: uninstall-local @GL_GENERATE_ALLOCA_H_FALSE@ rm -f $@ # Listed in the same order as the GNU makefile conventions, and -# provided by autoconf 2.59c+. +# provided by autoconf 2.59c+ or 2.70. # The Automake-defined pkg* macros are appended, in the order # listed in the Automake 1.10a+ documentation. configmake.h: Makefile @@ -2091,6 +2155,7 @@ configmake.h: Makefile echo '#define SYSCONFDIR "$(sysconfdir)"'; \ echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \ echo '#define LOCALSTATEDIR "$(localstatedir)"'; \ + echo '#define RUNSTATEDIR "$(runstatedir)"'; \ echo '#define INCLUDEDIR "$(includedir)"'; \ echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \ echo '#define DOCDIR "$(docdir)"'; \ @@ -2267,6 +2332,7 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \ -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \ -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \ + -e 's/@''REPLACE_STRTOUMAX''@/$(REPLACE_STRTOUMAX)/g' \ -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \ -e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \ -e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \ @@ -3032,6 +3098,7 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \ + -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \ -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ @@ -3041,6 +3108,8 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \ + -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \ + -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \ -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \ -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \ -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ @@ -3168,6 +3237,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \ + -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \ -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ diff --git a/gnu/acl-errno-valid.c b/gnu/acl-errno-valid.c index ef0ae95..b18694b 100644 --- a/gnu/acl-errno-valid.c +++ b/gnu/acl-errno-valid.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Test whether ACLs are well supported on this system. - Copyright 2013 Free Software Foundation, Inc. + Copyright 2013-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/acl-internal.h b/gnu/acl-internal.h index 6d3e4cb..40d4317 100644 --- a/gnu/acl-internal.h +++ b/gnu/acl-internal.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Internal implementation of access control lists. - Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -62,6 +62,9 @@ extern int aclsort (int, int, struct acl *); # define fchmod(fd, mode) (-1) #endif +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif _GL_INLINE_HEADER_BEGIN #ifndef ACL_INTERNAL_INLINE # define ACL_INTERNAL_INLINE _GL_INLINE diff --git a/gnu/acl.h b/gnu/acl.h index 519a1d4..1d23f92 100644 --- a/gnu/acl.h +++ b/gnu/acl.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* acl.c - access control lists - Copyright (C) 2002, 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2002, 2008-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/acl_entries.c b/gnu/acl_entries.c index d52d83a..8fac13c 100644 --- a/gnu/acl_entries.c +++ b/gnu/acl_entries.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Return the number of entries in an ACL. - Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/alloca.in.h b/gnu/alloca.in.h index 2fce582..7630f68 100644 --- a/gnu/alloca.in.h +++ b/gnu/alloca.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Memory allocation on the stack. - Copyright (C) 1995, 1999, 2001-2004, 2006-2013 Free Software Foundation, + Copyright (C) 1995, 1999, 2001-2004, 2006-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it diff --git a/gnu/allocator.h b/gnu/allocator.h index 44fdefa..513c7df 100644 --- a/gnu/allocator.h +++ b/gnu/allocator.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Memory allocators such as malloc+free. - Copyright (C) 2011-2013 Free Software Foundation, Inc. + Copyright (C) 2011-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/anytostr.c b/gnu/anytostr.c index afffa83..77a116c 100644 --- a/gnu/anytostr.c +++ b/gnu/anytostr.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* anytostr.c -- convert integers to printable strings - Copyright (C) 2001, 2006, 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2001, 2006, 2008-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/areadlink.c b/gnu/areadlink.c index 78504c8..2ecf332 100644 --- a/gnu/areadlink.c +++ b/gnu/areadlink.c @@ -3,7 +3,7 @@ /* areadlink.c -- readlink wrapper to return the link name in malloc'd storage Unlike xreadlink and xreadlink_with_size, don't ever call exit. - Copyright (C) 2001, 2003-2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2001, 2003-2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/areadlink.h b/gnu/areadlink.h index 6619f78..db86a35 100644 --- a/gnu/areadlink.h +++ b/gnu/areadlink.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Read symbolic links without size limitation. - Copyright (C) 2001, 2003-2004, 2007, 2009-2013 Free Software Foundation, + Copyright (C) 2001, 2003-2004, 2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/areadlinkat.c b/gnu/areadlinkat.c index 0dfc011..564704a 100644 --- a/gnu/areadlinkat.c +++ b/gnu/areadlinkat.c @@ -3,7 +3,7 @@ /* areadlinkat.c -- readlinkat wrapper to return malloc'd link name Unlike xreadlinkat, only call exit on failure to change directory. - Copyright (C) 2001, 2003-2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2001, 2003-2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/argmatch.c b/gnu/argmatch.c index 459bf2e..c26bcb3 100644 --- a/gnu/argmatch.c +++ b/gnu/argmatch.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* argmatch.c -- find a match for a string in an array - Copyright (C) 1990, 1998-1999, 2001-2007, 2009-2013 Free Software + Copyright (C) 1990, 1998-1999, 2001-2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/argmatch.h b/gnu/argmatch.h index f373057..f97a358 100644 --- a/gnu/argmatch.h +++ b/gnu/argmatch.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* argmatch.h -- definitions and prototypes for argmatch.c - Copyright (C) 1990, 1998-1999, 2001-2002, 2004-2005, 2009-2013 Free Software + Copyright (C) 1990, 1998-1999, 2001-2002, 2004-2005, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/argp-ba.c b/gnu/argp-ba.c index 566d916..df0f48d 100644 --- a/gnu/argp-ba.c +++ b/gnu/argp-ba.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Default definition for ARGP_PROGRAM_BUG_ADDRESS. - Copyright (C) 1996-1997, 1999, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1996-1997, 1999, 2009-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . diff --git a/gnu/argp-eexst.c b/gnu/argp-eexst.c index 47d5848..6b40327 100644 --- a/gnu/argp-eexst.c +++ b/gnu/argp-eexst.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Default definition for ARGP_ERR_EXIT_STATUS - Copyright (C) 1997, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1997, 2009-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . diff --git a/gnu/argp-fmtstream.c b/gnu/argp-fmtstream.c index 201df85..042bb89 100644 --- a/gnu/argp-fmtstream.c +++ b/gnu/argp-fmtstream.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Word-wrapping and line-truncating streams - Copyright (C) 1997-1999, 2001-2003, 2005, 2009-2013 Free Software + Copyright (C) 1997-1999, 2001-2003, 2005, 2009-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . diff --git a/gnu/argp-fmtstream.h b/gnu/argp-fmtstream.h index 71b91b6..dad5af8 100644 --- a/gnu/argp-fmtstream.h +++ b/gnu/argp-fmtstream.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Word-wrapping and line-truncating streams. - Copyright (C) 1997, 2006-2013 Free Software Foundation, Inc. + Copyright (C) 1997, 2006-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . @@ -199,6 +199,9 @@ extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount); #define __argp_fmtstream_point argp_fmtstream_point #define __argp_fmtstream_update _argp_fmtstream_update #define __argp_fmtstream_ensure _argp_fmtstream_ensure +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif _GL_INLINE_HEADER_BEGIN #ifndef ARGP_FS_EI # define ARGP_FS_EI _GL_INLINE diff --git a/gnu/argp-fs-xinl.c b/gnu/argp-fs-xinl.c index f815803..6acbe2f 100644 --- a/gnu/argp-fs-xinl.c +++ b/gnu/argp-fs-xinl.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Real definitions for extern inline functions in argp-fmtstream.h - Copyright (C) 1997, 2003-2004, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1997, 2003-2004, 2009-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . diff --git a/gnu/argp-help.c b/gnu/argp-help.c index 9f7a4f2..e529869 100644 --- a/gnu/argp-help.c +++ b/gnu/argp-help.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Hierarchical argument parsing help output - Copyright (C) 1995-2005, 2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1995-2005, 2007, 2009-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . diff --git a/gnu/argp-namefrob.h b/gnu/argp-namefrob.h index ca93741..1e3f079 100644 --- a/gnu/argp-namefrob.h +++ b/gnu/argp-namefrob.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Name frobnication for compiling argp outside of glibc - Copyright (C) 1997, 2003, 2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1997, 2003, 2007, 2009-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . diff --git a/gnu/argp-parse.c b/gnu/argp-parse.c index 0e8de13..76c0544 100644 --- a/gnu/argp-parse.c +++ b/gnu/argp-parse.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Hierarchical argument parsing, layered over getopt - Copyright (C) 1995-2000, 2002-2004, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1995-2000, 2002-2004, 2009-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . diff --git a/gnu/argp-pin.c b/gnu/argp-pin.c index fd936e4..f324e6d 100644 --- a/gnu/argp-pin.c +++ b/gnu/argp-pin.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Full and short program names for argp module - Copyright (C) 2005, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/argp-pv.c b/gnu/argp-pv.c index ed657eb..d2c9b4f 100644 --- a/gnu/argp-pv.c +++ b/gnu/argp-pv.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Default definition for ARGP_PROGRAM_VERSION. - Copyright (C) 1996-1997, 1999, 2006, 2009-2013 Free Software Foundation, + Copyright (C) 1996-1997, 1999, 2006, 2009-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . diff --git a/gnu/argp-pvh.c b/gnu/argp-pvh.c index 74ff098..1fedac1 100644 --- a/gnu/argp-pvh.c +++ b/gnu/argp-pvh.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Default definition for ARGP_PROGRAM_VERSION_HOOK. - Copyright (C) 1996-1997, 1999, 2004, 2009-2013 Free Software Foundation, + Copyright (C) 1996-1997, 1999, 2004, 2009-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . diff --git a/gnu/argp-version-etc.c b/gnu/argp-version-etc.c index b85934c..d9ca70b 100644 --- a/gnu/argp-version-etc.c +++ b/gnu/argp-version-etc.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Version hook for Argp. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/argp-version-etc.h b/gnu/argp-version-etc.h index 49670cf..8330a99 100644 --- a/gnu/argp-version-etc.h +++ b/gnu/argp-version-etc.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Version hook for Argp. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/argp-xinl.c b/gnu/argp-xinl.c index 9e58ab7..7dbdf73 100644 --- a/gnu/argp-xinl.c +++ b/gnu/argp-xinl.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Real definitions for extern inline functions in argp.h - Copyright (C) 1997-1998, 2004, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1997-1998, 2004, 2009-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . diff --git a/gnu/argp.h b/gnu/argp.h index dbaf366..f3e1f62 100644 --- a/gnu/argp.h +++ b/gnu/argp.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Hierarchical argument parsing, layered over getopt. - Copyright (C) 1995-1999, 2003-2013 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2003-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Miles Bader . @@ -581,6 +581,9 @@ extern void *__argp_input (const struct argp *__restrict __argp, # define __argp_state_help argp_state_help # define __option_is_short _option_is_short # define __option_is_end _option_is_end +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif _GL_INLINE_HEADER_BEGIN # ifndef ARGP_EI # define ARGP_EI _GL_INLINE diff --git a/gnu/asnprintf.c b/gnu/asnprintf.c index 2995b56..1ed4a04 100644 --- a/gnu/asnprintf.c +++ b/gnu/asnprintf.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/asprintf.c b/gnu/asprintf.c index bb5eab5..df6e5c5 100644 --- a/gnu/asprintf.c +++ b/gnu/asprintf.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2007, 2009-2013 Free Software Foundation, + Copyright (C) 1999, 2002, 2006-2007, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/gnu/at-func.c b/gnu/at-func.c index 875e039..774756d 100644 --- a/gnu/at-func.c +++ b/gnu/at-func.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Define at-style functions like fstatat, unlinkat, fchownat, etc. - Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/at-func2.c b/gnu/at-func2.c index 0c60c57..fa796a8 100644 --- a/gnu/at-func2.c +++ b/gnu/at-func2.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Define 2-FD at-style functions like linkat or renameat. - Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/backupfile.c b/gnu/backupfile.c index b2eb43a..b6c8aec 100644 --- a/gnu/backupfile.c +++ b/gnu/backupfile.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* backupfile.c -- make Emacs style backup file names - Copyright (C) 1990-2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1990-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/backupfile.h b/gnu/backupfile.h index 4232371..7a2ad9a 100644 --- a/gnu/backupfile.h +++ b/gnu/backupfile.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* backupfile.h -- declarations for making Emacs style backup file names - Copyright (C) 1990-1992, 1997-1999, 2003-2004, 2009-2013 Free Software + Copyright (C) 1990-1992, 1997-1999, 2003-2004, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/basename-lgpl.c b/gnu/basename-lgpl.c index 7681409..74257f8 100644 --- a/gnu/basename-lgpl.c +++ b/gnu/basename-lgpl.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* basename.c -- return the last element in a file name - Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2013 Free Software + Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/basename.c b/gnu/basename.c index 7434a68..ac740b2 100644 --- a/gnu/basename.c +++ b/gnu/basename.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* basename.c -- return the last element in a file name - Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2013 Free Software + Copyright (C) 1990, 1998-2001, 2003-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/bitrotate.h b/gnu/bitrotate.h index ece6237..31b9bc5 100644 --- a/gnu/bitrotate.h +++ b/gnu/bitrotate.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* bitrotate.h - Rotate bits in integers - Copyright (C) 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2008-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,6 +25,9 @@ #include #include +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif _GL_INLINE_HEADER_BEGIN #ifndef BITROTATE_INLINE # define BITROTATE_INLINE _GL_INLINE diff --git a/gnu/btowc.c b/gnu/btowc.c index 7481a7b..3f3c6d8 100644 --- a/gnu/btowc.c +++ b/gnu/btowc.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Convert unibyte character to wide character. - Copyright (C) 2008, 2010-2013 Free Software Foundation, Inc. + Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/gnu/c-ctype.c b/gnu/c-ctype.c index ef40320..e9e0c56 100644 --- a/gnu/c-ctype.c +++ b/gnu/c-ctype.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Character handling in C locale. - Copyright 2000-2003, 2006, 2009-2013 Free Software Foundation, Inc. + Copyright 2000-2003, 2006, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/c-ctype.h b/gnu/c-ctype.h index 1a9a127..3fe2b25 100644 --- a/gnu/c-ctype.h +++ b/gnu/c-ctype.h @@ -7,7 +7,7 @@ functions' behaviour depends on the current locale set via setlocale. - Copyright (C) 2000-2003, 2006, 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2006, 2008-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/c-strcase.h b/gnu/c-strcase.h index 3c11861..b303675 100644 --- a/gnu/c-strcase.h +++ b/gnu/c-strcase.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Case-insensitive string comparison functions in C locale. - Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2013 Free Software + Copyright (C) 1995-1996, 2001, 2003, 2005, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/gnu/c-strcasecmp.c b/gnu/c-strcasecmp.c index b156a97..87c6734 100644 --- a/gnu/c-strcasecmp.c +++ b/gnu/c-strcasecmp.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* c-strcasecmp.c -- case insensitive string comparator in C locale - Copyright (C) 1998-1999, 2005-2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/c-strcaseeq.h b/gnu/c-strcaseeq.h index b640e1f..58005a9 100644 --- a/gnu/c-strcaseeq.h +++ b/gnu/c-strcaseeq.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Optimized case-insensitive string comparison in C locale. - Copyright (C) 2001-2002, 2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/gnu/c-strncasecmp.c b/gnu/c-strncasecmp.c index 7f08eae..17b4f0a 100644 --- a/gnu/c-strncasecmp.c +++ b/gnu/c-strncasecmp.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* c-strncasecmp.c -- case insensitive string comparator in C locale - Copyright (C) 1998-1999, 2005-2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2006, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/canonicalize-lgpl.c b/gnu/canonicalize-lgpl.c index cddd071..f9244b1 100644 --- a/gnu/canonicalize-lgpl.c +++ b/gnu/canonicalize-lgpl.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Return the canonical absolute name of a given file. - Copyright (C) 1996-2013 Free Software Foundation, Inc. + Copyright (C) 1996-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify diff --git a/gnu/careadlinkat.c b/gnu/careadlinkat.c index 9c8d103..7bb5906 100644 --- a/gnu/careadlinkat.c +++ b/gnu/careadlinkat.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Read symbolic links into a buffer without size limitation, relative to fd. - Copyright (C) 2001, 2003-2004, 2007, 2009-2013 Free Software Foundation, + Copyright (C) 2001, 2003-2004, 2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/careadlinkat.h b/gnu/careadlinkat.h index 202b84f..1a64b0c 100644 --- a/gnu/careadlinkat.h +++ b/gnu/careadlinkat.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Read symbolic links into a buffer without size limitation, relative to fd. - Copyright (C) 2011-2013 Free Software Foundation, Inc. + Copyright (C) 2011-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/chdir-long.c b/gnu/chdir-long.c index 872feb4..433a382 100644 --- a/gnu/chdir-long.c +++ b/gnu/chdir-long.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* provide a chdir function that tries not to fail due to ENAMETOOLONG - Copyright (C) 2004-2013 Free Software Foundation, Inc. + Copyright (C) 2004-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/chdir-long.h b/gnu/chdir-long.h index fdcff3b..01292c2 100644 --- a/gnu/chdir-long.h +++ b/gnu/chdir-long.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* provide a chdir function that tries not to fail due to ENAMETOOLONG - Copyright (C) 2004-2005, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2004-2005, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/chown.c b/gnu/chown.c index 95a503c..3759f52 100644 --- a/gnu/chown.c +++ b/gnu/chown.c @@ -3,7 +3,7 @@ /* provide consistent interface to chown for systems that don't interpret an ID of -1 as meaning "don't change the corresponding ID". - Copyright (C) 1997, 2004-2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1997, 2004-2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/cloexec.c b/gnu/cloexec.c index 4150759..f2c5d84 100644 --- a/gnu/cloexec.c +++ b/gnu/cloexec.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* closexec.c - set or clear the close-on-exec descriptor flag - Copyright (C) 1991, 2004-2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1991, 2004-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/cloexec.h b/gnu/cloexec.h index b214e06..83b9aaf 100644 --- a/gnu/cloexec.h +++ b/gnu/cloexec.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* closexec.c - set or clear the close-on-exec descriptor flag - Copyright (C) 2004, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2004, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/close-stream.c b/gnu/close-stream.c index 2df42d7..7ace2b2 100644 --- a/gnu/close-stream.c +++ b/gnu/close-stream.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Close a stream, with nicer error checking than fclose's. - Copyright (C) 1998-2002, 2004, 2006-2013 Free Software Foundation, Inc. + Copyright (C) 1998-2002, 2004, 2006-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/close.c b/gnu/close.c index debab3b..8c2206b 100644 --- a/gnu/close.c +++ b/gnu/close.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* close replacement. - Copyright (C) 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2008-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/closedir.c b/gnu/closedir.c index 7189b99..3ac254b 100644 --- a/gnu/closedir.c +++ b/gnu/closedir.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Stop reading the entries of a directory. - Copyright (C) 2006-2013 Free Software Foundation, Inc. + Copyright (C) 2006-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/closeout.c b/gnu/closeout.c index d7e3060..a143adb 100644 --- a/gnu/closeout.c +++ b/gnu/closeout.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Close standard output and standard error, exiting with a diagnostic on error. - Copyright (C) 1998-2002, 2004, 2006, 2008-2013 Free Software Foundation, + Copyright (C) 1998-2002, 2004, 2006, 2008-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/closeout.h b/gnu/closeout.h index a7bc618..1f4fabe 100644 --- a/gnu/closeout.h +++ b/gnu/closeout.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Close standard output and standard error. - Copyright (C) 1998, 2000, 2003-2004, 2006, 2008-2013 Free Software + Copyright (C) 1998, 2000, 2003-2004, 2006, 2008-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/config.charset b/gnu/config.charset index a991419..289bc44 100644 --- a/gnu/config.charset +++ b/gnu/config.charset @@ -1,7 +1,7 @@ #! /bin/sh # Output a system dependent table of character encoding aliases. # -# Copyright (C) 2000-2004, 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2000-2004, 2006-2014 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/gnu/copy-acl.c b/gnu/copy-acl.c index f60d584..ad3f2f1 100644 --- a/gnu/copy-acl.c +++ b/gnu/copy-acl.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* copy-acl.c - copy access control list from one file to another file - Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/dirent--.h b/gnu/dirent--.h index 897afc0..a1203bc 100644 --- a/gnu/dirent--.h +++ b/gnu/dirent--.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Like dirent.h, but redefine some names to avoid glitches. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/dirent-private.h b/gnu/dirent-private.h index 7fdeb35..d11d6f2 100644 --- a/gnu/dirent-private.h +++ b/gnu/dirent-private.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Private details of the DIR type. - Copyright (C) 2011-2013 Free Software Foundation, Inc. + Copyright (C) 2011-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/dirent-safer.h b/gnu/dirent-safer.h index 9a8b6ce..083db28 100644 --- a/gnu/dirent-safer.h +++ b/gnu/dirent-safer.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Invoke dirent-like functions, but avoid some glitches. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/dirent.in.h b/gnu/dirent.in.h index 33c6498..86f4966 100644 --- a/gnu/dirent.in.h +++ b/gnu/dirent.in.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A GNU-like . - Copyright (C) 2006-2013 Free Software Foundation, Inc. + Copyright (C) 2006-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/dirfd.c b/gnu/dirfd.c index f496be6..050912b 100644 --- a/gnu/dirfd.c +++ b/gnu/dirfd.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* dirfd.c -- return the file descriptor associated with an open DIR* - Copyright (C) 2001, 2006, 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2001, 2006, 2008-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/dirname-lgpl.c b/gnu/dirname-lgpl.c index e3a45ec..1206241 100644 --- a/gnu/dirname-lgpl.c +++ b/gnu/dirname-lgpl.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* dirname.c -- return all but the last element in a file name - Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2013 Free Software + Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/dirname.c b/gnu/dirname.c index b7e1846..cff08e8 100644 --- a/gnu/dirname.c +++ b/gnu/dirname.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* dirname.c -- return all but the last element in a file name - Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2013 Free Software + Copyright (C) 1990, 1998, 2000-2001, 2003-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/dirname.h b/gnu/dirname.h index 7864dc3..9d3ab05 100644 --- a/gnu/dirname.h +++ b/gnu/dirname.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Take file names apart into directory and base names. - Copyright (C) 1998, 2001, 2003-2006, 2009-2013 Free Software Foundation, + Copyright (C) 1998, 2001, 2003-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/dosname.h b/gnu/dosname.h index 5cea749..ae5fa1b 100644 --- a/gnu/dosname.h +++ b/gnu/dosname.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* File names on MS-DOS/Windows systems. - Copyright (C) 2000-2001, 2004-2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2000-2001, 2004-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/dup-safer.c b/gnu/dup-safer.c index 64cbd7e..6319cb7 100644 --- a/gnu/dup-safer.c +++ b/gnu/dup-safer.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Invoke dup, but avoid some glitches. - Copyright (C) 2001, 2004-2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2001, 2004-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/dup.c b/gnu/dup.c index 0d15169..7faf302 100644 --- a/gnu/dup.c +++ b/gnu/dup.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Duplicate an open file descriptor. - Copyright (C) 2011-2013 Free Software Foundation, Inc. + Copyright (C) 2011-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/dup2.c b/gnu/dup2.c index 172f24e..9428f0f 100644 --- a/gnu/dup2.c +++ b/gnu/dup2.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Duplicate an open file descriptor to a specified file descriptor. - Copyright (C) 1999, 2004-2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1999, 2004-2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -98,7 +98,11 @@ rpl_dup2 (int fd, int desired_fd) /* On Linux kernels 2.6.26-2.6.29, dup2 (fd, fd) returns -EBADF. On Cygwin 1.5.x, dup2 (1, 1) returns 0. On Cygwin 1.7.17, dup2 (1, -1) dumps core. + On Cygwin 1.7.25, dup2 (1, 256) can dump core. On Haiku, dup2 (fd, fd) mistakenly clears FD_CLOEXEC. */ +# if HAVE_SETDTABLESIZE + setdtablesize (desired_fd + 1); +# endif if (desired_fd < 0) fd = desired_fd; if (fd == desired_fd) diff --git a/gnu/errno.in.h b/gnu/errno.in.h index cbc4733..7072f19 100644 --- a/gnu/errno.in.h +++ b/gnu/errno.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A POSIX-like . - Copyright (C) 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2008-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/error.c b/gnu/error.c index ae52a20..5f929df 100644 --- a/gnu/error.c +++ b/gnu/error.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Error handler for noninteractive utilities - Copyright (C) 1990-1998, 2000-2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1990-1998, 2000-2007, 2009-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify @@ -197,7 +197,7 @@ print_errno_message (int errnum) #endif } -static void +static void _GL_ATTRIBUTE_FORMAT_PRINTF (3, 0) _GL_ARG_NONNULL ((3)) error_tail (int status, int errnum, const char *message, va_list args) { #if _LIBC diff --git a/gnu/error.h b/gnu/error.h index 28cc8ff..8d37706 100644 --- a/gnu/error.h +++ b/gnu/error.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Declaration for error-reporting function - Copyright (C) 1995-1997, 2003, 2006, 2008-2013 Free Software Foundation, + Copyright (C) 1995-1997, 2003, 2006, 2008-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/gnu/euidaccess.c b/gnu/euidaccess.c new file mode 100644 index 0000000..0bd3012 --- /dev/null +++ b/gnu/euidaccess.c @@ -0,0 +1,223 @@ +/* -*- buffer-read-only: t -*- vi: set ro: */ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* euidaccess -- check if effective user id can access file + + Copyright (C) 1990-1991, 1995, 1998, 2000, 2003-2006, 2008-2014 Free + Software Foundation, Inc. + + This file is part of the GNU C Library. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General 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 David MacKenzie and Torbjorn Granlund. + Adapted for GNU C library by Roland McGrath. */ + +#ifndef _LIBC +# include +#endif + +#include +#include +#include +#include + +#include "root-uid.h" + +#if HAVE_LIBGEN_H +# include +#endif + +#include +#ifndef __set_errno +# define __set_errno(val) errno = (val) +#endif + +#if defined EACCES && !defined EACCESS +# define EACCESS EACCES +#endif + +#ifndef F_OK +# define F_OK 0 +# define X_OK 1 +# define W_OK 2 +# define R_OK 4 +#endif + + +#ifdef _LIBC + +# define access __access +# define getuid __getuid +# define getgid __getgid +# define geteuid __geteuid +# define getegid __getegid +# define group_member __group_member +# define euidaccess __euidaccess +# undef stat +# define stat stat64 + +#endif + +/* Return 0 if the user has permission of type MODE on FILE; + otherwise, return -1 and set 'errno'. + Like access, except that it uses the effective user and group + id's instead of the real ones, and it does not always check for read-only + file system, text busy, etc. */ + +int +euidaccess (const char *file, int mode) +{ +#if HAVE_FACCESSAT /* glibc, AIX 7, Solaris 11, Cygwin 1.7 */ + return faccessat (AT_FDCWD, file, mode, AT_EACCESS); +#elif defined EFF_ONLY_OK /* IRIX, OSF/1, Interix */ + return access (file, mode | EFF_ONLY_OK); +#elif defined ACC_SELF /* AIX */ + return accessx (file, mode, ACC_SELF); +#elif HAVE_EACCESS /* FreeBSD */ + return eaccess (file, mode); +#else /* Mac OS X, NetBSD, OpenBSD, HP-UX, Solaris, Cygwin, mingw, BeOS */ + + uid_t uid = getuid (); + gid_t gid = getgid (); + uid_t euid = geteuid (); + gid_t egid = getegid (); + struct stat stats; + +# if HAVE_DECL_SETREGID && PREFER_NONREENTRANT_EUIDACCESS + + /* Define PREFER_NONREENTRANT_EUIDACCESS if you prefer euidaccess to + return the correct result even if this would make it + nonreentrant. Define this only if your entire application is + safe even if the uid or gid might temporarily change. If your + application uses signal handlers or threads it is probably not + safe. */ + + if (mode == F_OK) + return stat (file, &stats); + else + { + int result; + int saved_errno; + + if (uid != euid) + setreuid (euid, uid); + if (gid != egid) + setregid (egid, gid); + + result = access (file, mode); + saved_errno = errno; + + /* Restore them. */ + if (uid != euid) + setreuid (uid, euid); + if (gid != egid) + setregid (gid, egid); + + errno = saved_errno; + return result; + } + +# else + + /* The following code assumes the traditional Unix model, and is not + correct on systems that have ACLs or the like. However, it's + better than nothing, and it is reentrant. */ + + unsigned int granted; + if (uid == euid && gid == egid) + /* If we are not set-uid or set-gid, access does the same. */ + return access (file, mode); + + if (stat (file, &stats) != 0) + return -1; + + /* The super-user can read and write any file, and execute any file + that anyone can execute. */ + if (euid == ROOT_UID + && ((mode & X_OK) == 0 + || (stats.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))) + return 0; + + /* Convert the mode to traditional form, clearing any bogus bits. */ + if (R_OK == 4 && W_OK == 2 && X_OK == 1 && F_OK == 0) + mode &= 7; + else + mode = ((mode & R_OK ? 4 : 0) + + (mode & W_OK ? 2 : 0) + + (mode & X_OK ? 1 : 0)); + + if (mode == 0) + return 0; /* The file exists. */ + + /* Convert the file's permission bits to traditional form. */ + if (S_IRUSR == (4 << 6) && S_IWUSR == (2 << 6) && S_IXUSR == (1 << 6) + && S_IRGRP == (4 << 3) && S_IWGRP == (2 << 3) && S_IXGRP == (1 << 3) + && S_IROTH == (4 << 0) && S_IWOTH == (2 << 0) && S_IXOTH == (1 << 0)) + granted = stats.st_mode; + else + granted = ((stats.st_mode & S_IRUSR ? 4 << 6 : 0) + + (stats.st_mode & S_IWUSR ? 2 << 6 : 0) + + (stats.st_mode & S_IXUSR ? 1 << 6 : 0) + + (stats.st_mode & S_IRGRP ? 4 << 3 : 0) + + (stats.st_mode & S_IWGRP ? 2 << 3 : 0) + + (stats.st_mode & S_IXGRP ? 1 << 3 : 0) + + (stats.st_mode & S_IROTH ? 4 << 0 : 0) + + (stats.st_mode & S_IWOTH ? 2 << 0 : 0) + + (stats.st_mode & S_IXOTH ? 1 << 0 : 0)); + + if (euid == stats.st_uid) + granted >>= 6; + else if (egid == stats.st_gid || group_member (stats.st_gid)) + granted >>= 3; + + if ((mode & ~granted) == 0) + return 0; + __set_errno (EACCESS); + return -1; + +# endif +#endif +} +#undef euidaccess +#ifdef weak_alias +weak_alias (__euidaccess, euidaccess) +#endif + +#ifdef TEST +# include +# include +# include + +char *program_name; + +int +main (int argc, char **argv) +{ + char *file; + int mode; + int err; + + program_name = argv[0]; + if (argc < 3) + abort (); + file = argv[1]; + mode = atoi (argv[2]); + + err = euidaccess (file, mode); + printf ("%d\n", err); + if (err != 0) + error (0, errno, "%s", file); + exit (0); +} +#endif diff --git a/gnu/exclude.c b/gnu/exclude.c index ce16599..e2eb34b 100644 --- a/gnu/exclude.c +++ b/gnu/exclude.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* exclude.c -- exclude file names - Copyright (C) 1992-1994, 1997, 1999-2007, 2009-2013 Free Software + Copyright (C) 1992-1994, 1997, 1999-2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -34,6 +34,7 @@ #include #include #include +#include #include "exclude.h" #include "hash.h" @@ -41,6 +42,7 @@ #include "fnmatch.h" #include "xalloc.h" #include "verify.h" +#include "filename.h" #if USE_UNLOCKED_IO # include "unlocked-io.h" @@ -75,8 +77,12 @@ verify (((EXCLUDE_ANCHORED | EXCLUDE_INCLUDE | EXCLUDE_WILDCARDS) struct patopts { - char const *pattern; int options; + union + { + char const *pattern; + regex_t re; + } v; }; /* An array of pattern-options pairs. */ @@ -106,13 +112,33 @@ struct exclude_segment } v; }; +struct pattern_buffer + { + struct pattern_buffer *next; + char *base; + }; + /* The exclude structure keeps a singly-linked list of exclude segments, maintained in reverse order. */ struct exclude { struct exclude_segment *head; + struct pattern_buffer *patbuf; }; +/* Register BUF in the pattern buffer list of EX. ADD_FUNC (see + add_exclude_file and add_exclude_fp below) can use this function + if it modifies the pattern, to ensure the allocated memory will be + properly reclaimed upon calling free_exclude. */ +void +exclude_add_pattern_buffer (struct exclude *ex, char *buf) +{ + struct pattern_buffer *pbuf = xmalloc (sizeof *pbuf); + pbuf->base = buf; + pbuf->next = ex->patbuf; + ex->patbuf = pbuf; +} + /* Return true if STR has or may have wildcards, when matched with OPTIONS. Return false if STR definitely does not have wildcards. */ bool @@ -122,8 +148,20 @@ fnmatch_pattern_has_wildcards (const char *str, int options) { switch (*str++) { + case '.': + case '{': + case '}': + case '(': + case ')': + if (options & EXCLUDE_REGEX) + return true; + break; + case '\\': - str += ! (options & FNM_NOESCAPE) && *str; + if (options & EXCLUDE_REGEX) + continue; + else + str += ! (options & FNM_NOESCAPE) && *str; break; case '+': case '@': case '!': @@ -245,9 +283,16 @@ new_exclude_segment (struct exclude *ex, enum exclude_type type, int options) static void free_exclude_segment (struct exclude_segment *seg) { + size_t i; + switch (seg->type) { case exclude_pattern: + for (i = 0; i < seg->v.pat.exclude_count; i++) + { + if (seg->v.pat.exclude[i].options & EXCLUDE_REGEX) + regfree (&seg->v.pat.exclude[i].v.re); + } free (seg->v.pat.exclude); break; @@ -263,12 +308,23 @@ void free_exclude (struct exclude *ex) { struct exclude_segment *seg; + struct pattern_buffer *pbuf; + for (seg = ex->head; seg; ) { struct exclude_segment *next = seg->next; free_exclude_segment (seg); seg = next; } + + for (pbuf = ex->patbuf; pbuf; ) + { + struct pattern_buffer *next = pbuf->next; + free (pbuf->base); + free (pbuf); + pbuf = next; + } + free (ex); } @@ -333,11 +389,21 @@ exclude_fnmatch (char const *pattern, char const *f, int options) if (! (options & EXCLUDE_ANCHORED)) for (p = f; *p && ! matched; p++) if (*p == '/' && p[1] != '/') - matched = ((*matcher) (pattern, p + 1, options) == 0); + matched = ((*matcher) (pattern, p + 1, options) == 0); return matched; } +bool +exclude_patopts (struct patopts const *opts, char const *f) +{ + int options = opts->options; + + return (options & EXCLUDE_REGEX) + ? regexec (&opts->v.re, f, 0, NULL, 0) == 0 + : exclude_fnmatch (opts->v.pattern, f, options); +} + /* Return true if the exclude_pattern segment SEG matches F. */ static bool @@ -349,9 +415,7 @@ file_pattern_matches (struct exclude_segment const *seg, char const *f) for (i = 0; i < exclude_count; i++) { - char const *pattern = exclude[i].pattern; - int options = exclude[i].options; - if (exclude_fnmatch (pattern, f, options)) + if (exclude_patopts (exclude + i, f)) return true; } return false; @@ -456,17 +520,17 @@ void add_exclude (struct exclude *ex, char const *pattern, int options) { struct exclude_segment *seg; + struct exclude_pattern *pat; + struct patopts *patopts; - if ((options & EXCLUDE_WILDCARDS) + if ((options & (EXCLUDE_REGEX|EXCLUDE_WILDCARDS)) && fnmatch_pattern_has_wildcards (pattern, options)) { - struct exclude_pattern *pat; - struct patopts *patopts; - if (! (ex->head && ex->head->type == exclude_pattern - && ((ex->head->options & EXCLUDE_INCLUDE) - == (options & EXCLUDE_INCLUDE)))) - new_exclude_segment (ex, exclude_pattern, options); + && ((ex->head->options & EXCLUDE_INCLUDE) + == (options & EXCLUDE_INCLUDE)))) + new_exclude_segment (ex, exclude_pattern, options); + seg = ex->head; pat = &seg->v.pat; @@ -474,8 +538,51 @@ add_exclude (struct exclude *ex, char const *pattern, int options) pat->exclude = x2nrealloc (pat->exclude, &pat->exclude_alloc, sizeof *pat->exclude); patopts = &pat->exclude[pat->exclude_count++]; - patopts->pattern = pattern; + patopts->options = options; + if (options & EXCLUDE_REGEX) + { + int rc; + int cflags = REG_NOSUB|REG_EXTENDED| + ((options & FNM_CASEFOLD) ? REG_ICASE : 0); + + if (options & FNM_LEADING_DIR) + { + char *tmp; + size_t len = strlen (pattern); + + while (len > 0 && ISSLASH (pattern[len-1])) + --len; + + if (len == 0) + rc = 1; + else + { + tmp = xmalloc (len + 7); + memcpy (tmp, pattern, len); + strcpy (tmp + len, "(/.*)?"); + rc = regcomp (&patopts->v.re, tmp, cflags); + free (tmp); + } + } + else + rc = regcomp (&patopts->v.re, pattern, cflags); + + if (rc) + { + pat->exclude_count--; + return; + } + } + else + { + if (options & EXCLUDE_ALLOC) + { + pattern = xstrdup (pattern); + exclude_add_pattern_buffer (ex, (char*) pattern); + } + patopts->v.pattern = pattern; + } } else { @@ -500,45 +607,39 @@ add_exclude (struct exclude *ex, char const *pattern, int options) /* Use ADD_FUNC to append to EX the patterns in FILE_NAME, each with OPTIONS. LINE_END terminates each pattern in the file. If LINE_END is a space character, ignore trailing spaces and empty - lines in FILE. Return -1 on failure, 0 on success. */ + lines in FP. Return -1 on failure, 0 on success. */ int -add_exclude_file (void (*add_func) (struct exclude *, char const *, int), - struct exclude *ex, char const *file_name, int options, - char line_end) +add_exclude_fp (void (*add_func) (struct exclude *, char const *, int, void *), + struct exclude *ex, FILE *fp, int options, + char line_end, + void *data) { - bool use_stdin = file_name[0] == '-' && !file_name[1]; - FILE *in; char *buf = NULL; char *p; - char const *pattern; + char *pattern; char const *lim; size_t buf_alloc = 0; size_t buf_count = 0; int c; int e = 0; - if (use_stdin) - in = stdin; - else if (! (in = fopen (file_name, "r"))) - return -1; - - while ((c = getc (in)) != EOF) + while ((c = getc (fp)) != EOF) { if (buf_count == buf_alloc) buf = x2realloc (buf, &buf_alloc); buf[buf_count++] = c; } - if (ferror (in)) - e = errno; - - if (!use_stdin && fclose (in) != 0) + if (ferror (fp)) e = errno; buf = xrealloc (buf, buf_count + 1); buf[buf_count] = line_end; lim = buf + buf_count + ! (buf_count == 0 || buf[buf_count - 1] == line_end); + + exclude_add_pattern_buffer (ex, buf); + pattern = buf; for (p = buf; p < lim; p++) @@ -556,7 +657,7 @@ add_exclude_file (void (*add_func) (struct exclude *, char const *, int), } *pattern_end = '\0'; - (*add_func) (ex, pattern, options); + (*add_func) (ex, pattern, options, data); next_pattern: pattern = p + 1; @@ -565,3 +666,32 @@ add_exclude_file (void (*add_func) (struct exclude *, char const *, int), errno = e; return e ? -1 : 0; } + +static void +call_addfn (struct exclude *ex, char const *pattern, int options, void *data) +{ + void (*addfn) (struct exclude *, char const *, int) = data; + addfn (ex, pattern, options); +} + +int +add_exclude_file (void (*add_func) (struct exclude *, char const *, int), + struct exclude *ex, char const *file_name, int options, + char line_end) +{ + bool use_stdin = file_name[0] == '-' && !file_name[1]; + FILE *in; + int rc = 0; + + if (use_stdin) + in = stdin; + else if (! (in = fopen (file_name, "r"))) + return -1; + + rc = add_exclude_fp (call_addfn, ex, in, options, line_end, add_func); + + if (!use_stdin && fclose (in) != 0) + rc = -1; + + return rc; +} diff --git a/gnu/exclude.h b/gnu/exclude.h index 74a798e..47994d2 100644 --- a/gnu/exclude.h +++ b/gnu/exclude.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* exclude.h -- declarations for excluding file names - Copyright (C) 1992-1994, 1997, 1999, 2001-2003, 2005-2006, 2009-2013 Free + Copyright (C) 1992-1994, 1997, 1999, 2001-2003, 2005-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -22,6 +22,7 @@ #define _GL_EXCLUDE_H 1 #include +#include /* Written by Paul Eggert and Sergey Poznyakoff */ @@ -39,6 +40,12 @@ option, these characters are ordinary and fnmatch is not used. */ #define EXCLUDE_WILDCARDS (1 << 28) +/* Patterns are POSIX extended regular expressions */ +#define EXCLUDE_REGEX (1 << 27) + +/* Allocate storage for the pattern */ +#define EXCLUDE_ALLOC (1 << 26) + struct exclude; bool fnmatch_pattern_has_wildcards (const char *, int) _GL_ATTRIBUTE_PURE; @@ -48,7 +55,10 @@ void free_exclude (struct exclude *); void add_exclude (struct exclude *, char const *, int); int add_exclude_file (void (*) (struct exclude *, char const *, int), struct exclude *, char const *, int, char); +int add_exclude_fp (void (*) (struct exclude *, char const *, int, void *), + struct exclude *, FILE *, int, char, void *); bool excluded_file_name (struct exclude const *, char const *); -bool exclude_fnmatch (char const *pattern, char const *f, int options); +void exclude_add_pattern_buffer (struct exclude *ex, char *buf); +bool exclude_fnmatch (char const *, char const *, int); #endif /* _GL_EXCLUDE_H */ diff --git a/gnu/exitfail.c b/gnu/exitfail.c index 164a948..321c74c 100644 --- a/gnu/exitfail.c +++ b/gnu/exitfail.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Failure exit status - Copyright (C) 2002-2003, 2005-2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/exitfail.h b/gnu/exitfail.h index f2e2660..0347f46 100644 --- a/gnu/exitfail.h +++ b/gnu/exitfail.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Failure exit status - Copyright (C) 2002, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2002, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/faccessat.c b/gnu/faccessat.c new file mode 100644 index 0000000..8abb9c0 --- /dev/null +++ b/gnu/faccessat.c @@ -0,0 +1,47 @@ +/* -*- buffer-read-only: t -*- vi: set ro: */ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* Check the access rights of a file relative to an open directory. + Copyright (C) 2009-2014 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General 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 Eric Blake */ + +#include + +#include +#include + +#ifndef HAVE_ACCESS +/* Mingw lacks access, but it also lacks real vs. effective ids, so + the gnulib euidaccess module is good enough. */ +# undef access +# define access euidaccess +#endif + +/* Invoke access or euidaccess on file, FILE, using mode MODE, in the directory + open on descriptor FD. If possible, do it without changing the + working directory. Otherwise, resort to using save_cwd/fchdir, then + (access|euidaccess)/restore_cwd. If either the save_cwd or the + restore_cwd fails, then give a diagnostic and exit nonzero. + Note that this implementation only supports AT_EACCESS, although some + native versions also support AT_SYMLINK_NOFOLLOW. */ + +#define AT_FUNC_NAME faccessat +#define AT_FUNC_F1 euidaccess +#define AT_FUNC_F2 access +#define AT_FUNC_USE_F1_COND AT_EACCESS +#define AT_FUNC_POST_FILE_PARAM_DECLS , int mode, int flag +#define AT_FUNC_POST_FILE_ARGS , mode +#include "at-func.c" diff --git a/gnu/fchdir.c b/gnu/fchdir.c index 193f2f7..a39f117 100644 --- a/gnu/fchdir.c +++ b/gnu/fchdir.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* fchdir replacement. - Copyright (C) 2006-2013 Free Software Foundation, Inc. + Copyright (C) 2006-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/fchmodat.c b/gnu/fchmodat.c index d9a9250..0794284 100644 --- a/gnu/fchmodat.c +++ b/gnu/fchmodat.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Change the protections of file relative to an open directory. - Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/fchownat.c b/gnu/fchownat.c index 34dd509..47f2432 100644 --- a/gnu/fchownat.c +++ b/gnu/fchownat.c @@ -6,7 +6,7 @@ when the buggy fchownat-with-AT_SYMLINK_NOFOLLOW operates on a symlink, it mistakenly affects the symlink referent, rather than the symlink itself. - Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/fcntl.c b/gnu/fcntl.c index 02f0ddb..c272ec9 100644 --- a/gnu/fcntl.c +++ b/gnu/fcntl.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Provide file descriptor control. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/fcntl.in.h b/gnu/fcntl.in.h index 1b81633..8a1668c 100644 --- a/gnu/fcntl.in.h +++ b/gnu/fcntl.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Like , but with non-working flags defined to 0. - Copyright (C) 2006-2013 Free Software Foundation, Inc. + Copyright (C) 2006-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/fd-hook.c b/gnu/fd-hook.c index ac4423b..8b1688c 100644 --- a/gnu/fd-hook.c +++ b/gnu/fd-hook.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Hook for making making file descriptor functions close(), ioctl() extensible. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2009. This program is free software: you can redistribute it and/or modify it diff --git a/gnu/fd-hook.h b/gnu/fd-hook.h index 5a9d77c..30f352b 100644 --- a/gnu/fd-hook.h +++ b/gnu/fd-hook.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Hook for making making file descriptor functions close(), ioctl() extensible. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/gnu/fd-safer.c b/gnu/fd-safer.c index c6d1f50..7dcd9cf 100644 --- a/gnu/fd-safer.c +++ b/gnu/fd-safer.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Return a safer copy of a file descriptor. - Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/fdopendir.c b/gnu/fdopendir.c index a2fe988..cd08665 100644 --- a/gnu/fdopendir.c +++ b/gnu/fdopendir.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* provide a replacement fdopendir function - Copyright (C) 2004-2013 Free Software Foundation, Inc. + Copyright (C) 2004-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/fdutimensat.c b/gnu/fdutimensat.c index b1748d5..d761ad1 100644 --- a/gnu/fdutimensat.c +++ b/gnu/fdutimensat.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Set file access and modification times. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/gnu/file-has-acl.c b/gnu/file-has-acl.c index 6dca5d9..946ff2d 100644 --- a/gnu/file-has-acl.c +++ b/gnu/file-has-acl.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Test whether a file has a nontrivial access control list. - Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -77,8 +77,7 @@ acl_access_nontrivial (acl_t acl) } return got_one; -# else /* IRIX, Tru64 */ -# if HAVE_ACL_TO_SHORT_TEXT /* IRIX */ +# elif HAVE_ACL_TO_SHORT_TEXT /* IRIX */ /* Don't use acl_get_entry: it is undocumented. */ int count = acl->acl_cnt; @@ -95,8 +94,7 @@ acl_access_nontrivial (acl_t acl) } return 0; -# endif -# if HAVE_ACL_FREE_TEXT /* Tru64 */ +# elif HAVE_ACL_FREE_TEXT /* Tru64 */ /* Don't use acl_get_entry: it takes only one argument and does not work. */ int count = acl->acl_num; @@ -119,7 +117,10 @@ acl_access_nontrivial (acl_t acl) } return 0; -# endif +# else + + errno = ENOSYS; + return -1; # endif } diff --git a/gnu/fileblocks.c b/gnu/fileblocks.c index 17ffe6a..1302f2c 100644 --- a/gnu/fileblocks.c +++ b/gnu/fileblocks.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Convert file size to number of blocks on System V-like machines. - Copyright (C) 1990, 1997-1999, 2004-2006, 2009-2013 Free Software + Copyright (C) 1990, 1997-1999, 2004-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/filename.h b/gnu/filename.h index 37e2469..a5806e5 100644 --- a/gnu/filename.h +++ b/gnu/filename.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Basic filename support macros. - Copyright (C) 2001-2004, 2007-2013 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2007-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/filenamecat-lgpl.c b/gnu/filenamecat-lgpl.c index 2256630..a5cfc53 100644 --- a/gnu/filenamecat-lgpl.c +++ b/gnu/filenamecat-lgpl.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Concatenate two arbitrary file names. - Copyright (C) 1996-2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/filenamecat.h b/gnu/filenamecat.h index d2e1b92..b39df86 100644 --- a/gnu/filenamecat.h +++ b/gnu/filenamecat.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Concatenate two arbitrary file names. - Copyright (C) 1996-1997, 2003, 2005, 2007, 2009-2013 Free Software + Copyright (C) 1996-1997, 2003, 2005, 2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/float+.h b/gnu/float+.h index 6bc201c..3331ee1 100644 --- a/gnu/float+.h +++ b/gnu/float+.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Supplemental information about the floating-point formats. - Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2007. This program is free software; you can redistribute it and/or modify diff --git a/gnu/float.c b/gnu/float.c index 948c765..95c02ec 100644 --- a/gnu/float.c +++ b/gnu/float.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Auxiliary definitions for . - Copyright (C) 2011-2013 Free Software Foundation, Inc. + Copyright (C) 2011-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify diff --git a/gnu/float.in.h b/gnu/float.in.h index c52c500..2ddca7c 100644 --- a/gnu/float.in.h +++ b/gnu/float.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A correct . - Copyright (C) 2007-2013 Free Software Foundation, Inc. + Copyright (C) 2007-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/fnmatch.c b/gnu/fnmatch.c index d6d6363..47bea30 100644 --- a/gnu/fnmatch.c +++ b/gnu/fnmatch.c @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 1991-1993, 1996-2007, 2009-2013 Free Software Foundation, Inc. +/* Copyright (C) 1991-1993, 1996-2007, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/fnmatch.in.h b/gnu/fnmatch.in.h index c8f7132..4f0aae4 100644 --- a/gnu/fnmatch.in.h +++ b/gnu/fnmatch.in.h @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 1991-1993, 1996-1999, 2001-2003, 2005, 2007, 2009-2013 Free +/* Copyright (C) 1991-1993, 1996-1999, 2001-2003, 2005, 2007, 2009-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/gnu/fnmatch_loop.c b/gnu/fnmatch_loop.c index 1995506..d298431 100644 --- a/gnu/fnmatch_loop.c +++ b/gnu/fnmatch_loop.c @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 1991-1993, 1996-2006, 2009-2013 Free Software Foundation, Inc. +/* Copyright (C) 1991-1993, 1996-2006, 2009-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify @@ -229,6 +229,8 @@ FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end, c = *p++; for (;;) { + bool is_range = false; + if (!(flags & FNM_NOESCAPE) && c == L_('\\')) { if (*p == L_('\0')) @@ -422,8 +424,6 @@ FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end, } else { - bool is_range = false; - #ifdef _LIBC bool is_seqval = false; diff --git a/gnu/fpending.c b/gnu/fpending.c index dcca837..02b844f 100644 --- a/gnu/fpending.c +++ b/gnu/fpending.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* fpending.c -- return the number of pending output bytes on a stream - Copyright (C) 2000, 2004, 2006-2007, 2009-2013 Free Software Foundation, + Copyright (C) 2000, 2004, 2006-2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/fpending.h b/gnu/fpending.h index 6dfc099..53fe5ac 100644 --- a/gnu/fpending.h +++ b/gnu/fpending.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Declare __fpending. - Copyright (C) 2000, 2003, 2005-2006, 2009-2013 Free Software Foundation, + Copyright (C) 2000, 2003, 2005-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -22,11 +22,10 @@ #include #include +#if HAVE_STDIO_EXT_H +# include +#endif -#if HAVE_DECL___FPENDING -# if HAVE_STDIO_EXT_H -# include -# endif -#else -size_t __fpending (FILE *); +#if !HAVE_DECL___FPENDING +size_t __fpending (FILE *) _GL_ATTRIBUTE_PURE; #endif diff --git a/gnu/fprintftime.c b/gnu/fprintftime.c new file mode 100644 index 0000000..d5a59f9 --- /dev/null +++ b/gnu/fprintftime.c @@ -0,0 +1,4 @@ +/* -*- buffer-read-only: t -*- vi: set ro: */ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +#define FPRINTFTIME 1 +#include "strftime.c" diff --git a/gnu/fprintftime.h b/gnu/fprintftime.h new file mode 100644 index 0000000..d7546c8 --- /dev/null +++ b/gnu/fprintftime.h @@ -0,0 +1,31 @@ +/* -*- buffer-read-only: t -*- vi: set ro: */ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* Generate time strings directly to the output. */ + +/* Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General 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 + +/* A cross between fprintf and nstrftime, that prints directly + to the output stream, without the need for the potentially + large buffer that nstrftime would require. + + Output to stream FP the result of formatting (according to the + nstrftime format string, FMT) the time data, *TM, and the UTC + and NANOSECONDS values. */ +size_t fprintftime (FILE *fp, char const *fmt, struct tm const *tm, + int utc, int nanoseconds); diff --git a/gnu/fseek.c b/gnu/fseek.c index cfcc571..77efd29 100644 --- a/gnu/fseek.c +++ b/gnu/fseek.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* An fseek() function that, together with fflush(), is POSIX compliant. - Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/fseeko.c b/gnu/fseeko.c index 7c1ad9b..2b204ff 100644 --- a/gnu/fseeko.c +++ b/gnu/fseeko.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* An fseeko() function that, together with fflush(), is POSIX compliant. - Copyright (C) 2007-2013 Free Software Foundation, Inc. + Copyright (C) 2007-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/fstat.c b/gnu/fstat.c index 12a8bb6..eddda7f 100644 --- a/gnu/fstat.c +++ b/gnu/fstat.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* fstat() replacement. - Copyright (C) 2011-2013 Free Software Foundation, Inc. + Copyright (C) 2011-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/fstatat.c b/gnu/fstatat.c index c4ab81a..77f5259 100644 --- a/gnu/fstatat.c +++ b/gnu/fstatat.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Work around an fstatat bug on Solaris 9. - Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/full-write.c b/gnu/full-write.c index b24549e..a834f36 100644 --- a/gnu/full-write.c +++ b/gnu/full-write.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* An interface to read and write that retries (if necessary) until complete. - Copyright (C) 1993-1994, 1997-2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1993-1994, 1997-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/full-write.h b/gnu/full-write.h index 059c6a2..48a0ee5 100644 --- a/gnu/full-write.h +++ b/gnu/full-write.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* An interface to write() that writes all it is asked to write. - Copyright (C) 2002-2003, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/futimens.c b/gnu/futimens.c index 09c7b77..a70f22c 100644 --- a/gnu/futimens.c +++ b/gnu/futimens.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Set the access and modification time of an open fd. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/getcwd-lgpl.c b/gnu/getcwd-lgpl.c index f197a11..8d304f1 100644 --- a/gnu/getcwd-lgpl.c +++ b/gnu/getcwd-lgpl.c @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 2011-2013 Free Software Foundation, Inc. +/* Copyright (C) 2011-2014 Free Software Foundation, Inc. This file is part of gnulib. This program is free software: you can redistribute it and/or modify diff --git a/gnu/getcwd.c b/gnu/getcwd.c index 22ba534..e8f371e 100644 --- a/gnu/getcwd.c +++ b/gnu/getcwd.c @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 1991-1999, 2004-2013 Free Software Foundation, Inc. +/* Copyright (C) 1991-1999, 2004-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify diff --git a/gnu/getdelim.c b/gnu/getdelim.c index 1e92393..3d47c9d 100644 --- a/gnu/getdelim.c +++ b/gnu/getdelim.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* getdelim.c --- Implementation of replacement getdelim function. - Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2013 Free Software + Copyright (C) 1994, 1996-1998, 2001, 2003, 2005-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or diff --git a/gnu/getdtablesize.c b/gnu/getdtablesize.c index 86cf88c..8c02687 100644 --- a/gnu/getdtablesize.c +++ b/gnu/getdtablesize.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* getdtablesize() function for platforms that don't have it. - Copyright (C) 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2008-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify @@ -24,11 +24,11 @@ #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ -#include +# include -#include "msvc-inval.h" +# include "msvc-inval.h" -#if HAVE_MSVC_INVALID_PARAMETER_HANDLER +# if HAVE_MSVC_INVALID_PARAMETER_HANDLER static int _setmaxstdio_nothrow (int newmax) { @@ -46,10 +46,11 @@ _setmaxstdio_nothrow (int newmax) return result; } -# define _setmaxstdio _setmaxstdio_nothrow -#endif +# define _setmaxstdio _setmaxstdio_nothrow +# endif -/* Cache for the previous getdtablesize () result. */ +/* Cache for the previous getdtablesize () result. Safe to cache because + Windows also lacks setrlimit. */ static int dtablesize; int @@ -85,4 +86,24 @@ getdtablesize (void) return dtablesize; } +#elif HAVE_GETDTABLESIZE + +# include +# undef getdtablesize + +int +rpl_getdtablesize(void) +{ + /* To date, this replacement is only compiled for Cygwin 1.7.25, + which auto-increased the RLIMIT_NOFILE soft limit until it + hits the compile-time constant hard limit of 3200. Although + that version of cygwin supported a child process inheriting + a smaller soft limit, the smaller limit is not enforced, so + we might as well just report the hard limit. */ + struct rlimit lim; + if (!getrlimit (RLIMIT_NOFILE, &lim) && lim.rlim_max != RLIM_INFINITY) + return lim.rlim_max; + return getdtablesize (); +} + #endif diff --git a/gnu/getfilecon.c b/gnu/getfilecon.c index 1b9d672..80d6fb2 100644 --- a/gnu/getfilecon.c +++ b/gnu/getfilecon.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* wrap getfilecon, lgetfilecon, and fgetfilecon - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/getgroups.c b/gnu/getgroups.c new file mode 100644 index 0000000..16ba721 --- /dev/null +++ b/gnu/getgroups.c @@ -0,0 +1,133 @@ +/* -*- buffer-read-only: t -*- vi: set ro: */ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* provide consistent interface to getgroups for systems that don't allow N==0 + + Copyright (C) 1996, 1999, 2003, 2006-2014 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General 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 Jim Meyering */ + +#include + +#include + +#include +#include +#include + +#if !HAVE_GETGROUPS + +/* Provide a stub that fails with ENOSYS, since there is no group + information available on mingw. */ +int +getgroups (int n _GL_UNUSED, GETGROUPS_T *groups _GL_UNUSED) +{ + errno = ENOSYS; + return -1; +} + +#else /* HAVE_GETGROUPS */ + +# undef getgroups +# ifndef GETGROUPS_ZERO_BUG +# define GETGROUPS_ZERO_BUG 0 +# endif + +/* On OS X 10.6 and later, use the usual getgroups, not the one + supplied when _DARWIN_C_SOURCE is defined. _DARWIN_C_SOURCE is + normally defined, since it means "conform to POSIX, but add + non-POSIX extensions even if that violates the POSIX namespace + rules", which is what we normally want. But with getgroups there + is an inconsistency, and _DARWIN_C_SOURCE means "change getgroups() + so that it no longer works right". The BUGS section of compat(5) + says that the behavior is dubious if you compile different sections + of a program with different _DARWIN_C_SOURCE settings, so fix only + the offending symbol. */ +# ifdef __APPLE__ +int posix_getgroups (int, gid_t []) __asm ("_getgroups"); +# define getgroups posix_getgroups +# endif + +/* On at least Ultrix 4.3 and NextStep 3.2, getgroups (0, NULL) always + fails. On other systems, it returns the number of supplemental + groups for the process. This function handles that special case + and lets the system-provided function handle all others. However, + it can fail with ENOMEM if memory is tight. It is unspecified + whether the effective group id is included in the list. */ + +int +rpl_getgroups (int n, gid_t *group) +{ + int n_groups; + GETGROUPS_T *gbuf; + int saved_errno; + + if (n < 0) + { + errno = EINVAL; + return -1; + } + + if (n != 0 || !GETGROUPS_ZERO_BUG) + { + int result; + if (sizeof *group == sizeof *gbuf) + return getgroups (n, (GETGROUPS_T *) group); + + if (SIZE_MAX / sizeof *gbuf <= n) + { + errno = ENOMEM; + return -1; + } + gbuf = malloc (n * sizeof *gbuf); + if (!gbuf) + return -1; + result = getgroups (n, gbuf); + if (0 <= result) + { + n = result; + while (n--) + group[n] = gbuf[n]; + } + saved_errno = errno; + free (gbuf); + errno = saved_errno; + return result; + } + + n = 20; + while (1) + { + /* No need to worry about address arithmetic overflow here, + since the ancient systems that we're running on have low + limits on the number of secondary groups. */ + gbuf = malloc (n * sizeof *gbuf); + if (!gbuf) + return -1; + n_groups = getgroups (n, gbuf); + if (n_groups == -1 ? errno != EINVAL : n_groups < n) + break; + free (gbuf); + n *= 2; + } + + saved_errno = errno; + free (gbuf); + errno = saved_errno; + + return n_groups; +} + +#endif /* HAVE_GETGROUPS */ diff --git a/gnu/getline.c b/gnu/getline.c index 40c4061..f5b0ceb 100644 --- a/gnu/getline.c +++ b/gnu/getline.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* getline.c --- Implementation of replacement getline function. - Copyright (C) 2005-2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/gnu/getopt.c b/gnu/getopt.c index 504befd..2b041f6 100644 --- a/gnu/getopt.c +++ b/gnu/getopt.c @@ -4,7 +4,7 @@ NOTE: getopt is part of the C library, so if you don't know what "Keep this file name-space clean" means, talk to drepper@gnu.org before changing it! - Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2013 Free Software + Copyright (C) 1987-1996, 1998-2004, 2006, 2008-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/gnu/getopt.in.h b/gnu/getopt.in.h index 550fe49..98bc2f0 100644 --- a/gnu/getopt.in.h +++ b/gnu/getopt.in.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Declarations for getopt. - Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2013 Free Software + Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2007, 2009-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/gnu/getopt1.c b/gnu/getopt1.c index 043839a..af3366b 100644 --- a/gnu/getopt1.c +++ b/gnu/getopt1.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* getopt_long and getopt_long_only entry points for GNU getopt. - Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2013 Free Software + Copyright (C) 1987-1994, 1996-1998, 2004, 2006, 2009-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/gnu/getopt_int.h b/gnu/getopt_int.h index 5c1a90d..8ad4236 100644 --- a/gnu/getopt_int.h +++ b/gnu/getopt_int.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Internal declarations for getopt. - Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2013 Free Software + Copyright (C) 1989-1994, 1996-1999, 2001, 2003-2004, 2009-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/gnu/getpagesize.c b/gnu/getpagesize.c index fcd28ca..cf5254a 100644 --- a/gnu/getpagesize.c +++ b/gnu/getpagesize.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* getpagesize emulation for systems where it cannot be done in a C macro. - Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/gettext.h b/gnu/gettext.h index b6a070e..4419766 100644 --- a/gnu/gettext.h +++ b/gnu/gettext.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Convenience header for conditional use of GNU . - Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2013 Free Software + Copyright (C) 1995-1998, 2000-2002, 2004-2006, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/gnu/gettime.c b/gnu/gettime.c index 168e07b..39414c4 100644 --- a/gnu/gettime.c +++ b/gnu/gettime.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* gettime -- get the system clock - Copyright (C) 2002, 2004-2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2002, 2004-2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/gettimeofday.c b/gnu/gettimeofday.c index 693f2fa..6c6e2d0 100644 --- a/gnu/gettimeofday.c +++ b/gnu/gettimeofday.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Provide gettimeofday for systems that don't have it or for which it's broken. - Copyright (C) 2001-2003, 2005-2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2007, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/gnulib.mk b/gnu/gnulib.mk index aab99c0..2bbe444 100644 --- a/gnu/gnulib.mk +++ b/gnu/gnulib.mk @@ -1,6 +1,6 @@ ## DO NOT EDIT! GENERATED AUTOMATICALLY! ## Process this file with automake to produce Makefile.in. -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -21,7 +21,7 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl --lib=libgnu --source-base=gnu --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=lock --no-conditional-dependencies --no-libtool --macro-prefix=gl acl alloca argmatch argp argp-version-etc backupfile closeout configmake dirname error exclude exitfail extern-inline fchmodat fchownat fcntl-h fdopendir fdutimensat fileblocks fnmatch-gnu fseeko fstatat full-write futimens getline getopt-gnu getpagesize gettext gettime gitlog-to-changelog hash human inttostr inttypes lchown linkat localcharset manywarnings mkdirat mkdtemp mkfifoat modechange obstack openat parse-datetime priv-set progname quote quotearg readlinkat renameat root-uid rpmatch safe-read savedir selinux-at setenv snprintf stat-time stdbool stdint stpcpy strdup-posix strerror strtol strtoul symlinkat timespec unlinkat unlinkdir unlocked-io utimensat version-etc-fsf xalloc xalloc-die xgetcwd xstrtoumax xvasprintf +# Reproduce by: gnulib-tool --import --dir=. --local-dir=gl --lib=libgnu --source-base=gnu --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=lock --no-conditional-dependencies --no-libtool --macro-prefix=gl acl alloca argmatch argp argp-version-etc backupfile closeout configmake dirname error exclude exitfail extern-inline faccessat fchmodat fchownat fcntl-h fdopendir fdutimensat fileblocks fnmatch-gnu fprintftime fseeko fstatat full-write futimens getline getopt-gnu getpagesize gettext gettime gitlog-to-changelog hash human inttostr inttypes lchown linkat localcharset manywarnings mkdirat mkdtemp mkfifoat modechange obstack openat parse-datetime posix_openpt priv-set progname ptsname quote quotearg readlinkat renameat root-uid rpmatch safe-read savedir selinux-at setenv snprintf stat-time stdbool stdint stpcpy strdup-posix strerror strtoimax strtol strtoul strtoumax symlinkat timespec unlinkat unlinkdir unlocked-io unlockpt utimensat version-etc-fsf xalloc xalloc-die xgetcwd xstrtoumax xvasprintf AUTOMAKE_OPTIONS = 1.9.6 gnits subdir-objects @@ -48,6 +48,15 @@ libgnu_a_LIBADD = $(gl_LIBOBJS) libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) EXTRA_libgnu_a_SOURCES = +## begin gnulib module absolute-header + +# Use this preprocessor expression to decide whether #include_next works. +# Do not rely on a 'configure'-time test for this, since the expression +# might appear in an installed header, which is used by some other compiler. +HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER) + +## end gnulib module absolute-header + ## begin gnulib module acl libgnu_a_SOURCES += copy-acl.c set-acl.c @@ -268,7 +277,7 @@ EXTRA_DIST += closeout.h ## begin gnulib module configmake # Listed in the same order as the GNU makefile conventions, and -# provided by autoconf 2.59c+. +# provided by autoconf 2.59c+ or 2.70. # The Automake-defined pkg* macros are appended, in the order # listed in the Automake 1.10a+ documentation. configmake.h: Makefile @@ -284,6 +293,7 @@ configmake.h: Makefile echo '#define SYSCONFDIR "$(sysconfdir)"'; \ echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \ echo '#define LOCALSTATEDIR "$(localstatedir)"'; \ + echo '#define RUNSTATEDIR "$(runstatedir)"'; \ echo '#define INCLUDEDIR "$(includedir)"'; \ echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \ echo '#define DOCDIR "$(docdir)"'; \ @@ -460,6 +470,15 @@ EXTRA_libgnu_a_SOURCES += error.c ## end gnulib module error +## begin gnulib module euidaccess + + +EXTRA_DIST += euidaccess.c + +EXTRA_libgnu_a_SOURCES += euidaccess.c + +## end gnulib module euidaccess + ## begin gnulib module exclude libgnu_a_SOURCES += exclude.c @@ -476,6 +495,15 @@ EXTRA_DIST += exitfail.h ## end gnulib module exitfail +## begin gnulib module faccessat + + +EXTRA_DIST += at-func.c faccessat.c + +EXTRA_libgnu_a_SOURCES += at-func.c faccessat.c + +## end gnulib module faccessat + ## begin gnulib module fchdir @@ -664,6 +692,14 @@ EXTRA_libgnu_a_SOURCES += fpending.c ## end gnulib module fpending +## begin gnulib module fprintftime + +libgnu_a_SOURCES += fprintftime.c + +EXTRA_DIST += fprintftime.h + +## end gnulib module fprintftime + ## begin gnulib module fseek @@ -751,6 +787,15 @@ EXTRA_libgnu_a_SOURCES += getdtablesize.c ## end gnulib module getdtablesize +## begin gnulib module getgroups + + +EXTRA_DIST += getgroups.c + +EXTRA_libgnu_a_SOURCES += getgroups.c + +## end gnulib module getgroups + ## begin gnulib module getline @@ -837,10 +882,19 @@ EXTRA_libgnu_a_SOURCES += gettimeofday.c ## begin gnulib module gitlog-to-changelog -EXTRA_DIST += $(top_srcdir)/build-aux/gitlog-to-changelog +EXTRA_DIST += $(top_srcdir)/build-aux/gitlog-to-changelog $(top_srcdir)/build-aux/git-log-fix ## end gnulib module gitlog-to-changelog +## begin gnulib module group-member + + +EXTRA_DIST += group-member.c + +EXTRA_libgnu_a_SOURCES += group-member.c + +## end gnulib module group-member + ## begin gnulib module hash libgnu_a_SOURCES += hash.c @@ -914,6 +968,7 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \ -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \ -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \ + -e 's/@''REPLACE_STRTOUMAX''@/$(REPLACE_STRTOUMAX)/g' \ -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \ -e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \ -e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \ @@ -930,6 +985,15 @@ EXTRA_DIST += inttypes.in.h ## end gnulib module inttypes-incomplete +## begin gnulib module isatty + + +EXTRA_DIST += isatty.c + +EXTRA_libgnu_a_SOURCES += isatty.c + +## end gnulib module isatty + ## begin gnulib module iswblank @@ -1421,6 +1485,15 @@ EXTRA_DIST += pathmax.h ## end gnulib module pathmax +## begin gnulib module posix_openpt + + +EXTRA_DIST += posix_openpt.c + +EXTRA_libgnu_a_SOURCES += posix_openpt.c + +## end gnulib module posix_openpt + ## begin gnulib module priv-set libgnu_a_SOURCES += priv-set.c @@ -1435,6 +1508,24 @@ libgnu_a_SOURCES += progname.h progname.c ## end gnulib module progname +## begin gnulib module ptsname + + +EXTRA_DIST += ptsname.c + +EXTRA_libgnu_a_SOURCES += ptsname.c + +## end gnulib module ptsname + +## begin gnulib module ptsname_r + + +EXTRA_DIST += ptsname_r.c + +EXTRA_libgnu_a_SOURCES += ptsname_r.c + +## end gnulib module ptsname_r + ## begin gnulib module qacl libgnu_a_SOURCES += acl-errno-valid.c file-has-acl.c qcopy-acl.c qset-acl.c @@ -2345,6 +2436,14 @@ EXTRA_libgnu_a_SOURCES += strerror-override.c ## end gnulib module strerror-override +## begin gnulib module strftime + +libgnu_a_SOURCES += strftime.c + +EXTRA_DIST += strftime.h + +## end gnulib module strftime + ## begin gnulib module string BUILT_SOURCES += string.h @@ -2500,6 +2599,15 @@ libgnu_a_SOURCES += strnlen1.h strnlen1.c ## end gnulib module strnlen1 +## begin gnulib module strtoimax + + +EXTRA_DIST += strtoimax.c + +EXTRA_libgnu_a_SOURCES += strtoimax.c + +## end gnulib module strtoimax + ## begin gnulib module strtol @@ -2509,6 +2617,15 @@ EXTRA_libgnu_a_SOURCES += strtol.c ## end gnulib module strtol +## begin gnulib module strtoll + + +EXTRA_DIST += strtol.c strtoll.c + +EXTRA_libgnu_a_SOURCES += strtol.c strtoll.c + +## end gnulib module strtoll + ## begin gnulib module strtoul @@ -2726,6 +2843,7 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \ + -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \ -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ @@ -2735,6 +2853,8 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $( -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \ + -e 's|@''REPLACE_GMTIME''@|$(REPLACE_GMTIME)|g' \ + -e 's|@''REPLACE_LOCALTIME''@|$(REPLACE_LOCALTIME)|g' \ -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \ -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \ -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ @@ -2771,6 +2891,15 @@ EXTRA_DIST += timespec.h ## end gnulib module timespec +## begin gnulib module ttyname_r + + +EXTRA_DIST += ttyname_r.c + +EXTRA_libgnu_a_SOURCES += ttyname_r.c + +## end gnulib module ttyname_r + ## begin gnulib module unistd BUILT_SOURCES += unistd.h @@ -2889,6 +3018,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \ + -e 's|@''REPLACE_GETDTABLESIZE''@|$(REPLACE_GETDTABLESIZE)|g' \ -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ @@ -3005,6 +3135,15 @@ EXTRA_DIST += unlocked-io.h ## end gnulib module unlocked-io +## begin gnulib module unlockpt + + +EXTRA_DIST += unlockpt.c + +EXTRA_libgnu_a_SOURCES += unlockpt.c + +## end gnulib module unlockpt + ## begin gnulib module unsetenv diff --git a/gnu/group-member.c b/gnu/group-member.c new file mode 100644 index 0000000..57bbda5 --- /dev/null +++ b/gnu/group-member.c @@ -0,0 +1,121 @@ +/* -*- buffer-read-only: t -*- vi: set ro: */ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* 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 + Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General 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 + +#include +#include +#include + +#include "xalloc-oversized.h" + +/* Most processes have no more than this many groups, and for these + processes we can avoid using malloc. */ +enum { GROUPBUF_SIZE = 100 }; + +struct group_info + { + gid_t *group; + gid_t groupbuf[GROUPBUF_SIZE]; + }; + +static void +free_group_info (struct group_info const *g) +{ + if (g->group != g->groupbuf) + free (g->group); +} + +static int +get_group_info (struct group_info *gi) +{ + int n_groups = getgroups (GROUPBUF_SIZE, gi->groupbuf); + gi->group = gi->groupbuf; + + if (n_groups < 0) + { + int n_group_slots = getgroups (0, NULL); + if (0 <= n_group_slots + && ! xalloc_oversized (n_group_slots, sizeof *gi->group)) + { + gi->group = malloc (n_group_slots * sizeof *gi->group); + if (gi->group) + n_groups = getgroups (n_group_slots, gi->group); + } + } + + /* In case of error, the user loses. */ + return n_groups; +} + +/* Return non-zero if GID is one that we have in our groups list. + Note that the groups list is not guaranteed to contain the current + or effective group ID, so they should generally be checked + separately. */ + +int +group_member (gid_t gid) +{ + int i; + int found; + struct group_info gi; + int n_groups = get_group_info (&gi); + + /* Search through the list looking for GID. */ + found = 0; + for (i = 0; i < n_groups; i++) + { + if (gid == gi.group[i]) + { + found = 1; + break; + } + } + + free_group_info (&gi); + + return found; +} + +#ifdef TEST + +char *program_name; + +int +main (int argc, char **argv) +{ + int i; + + program_name = argv[0]; + + for (i = 1; i < argc; i++) + { + gid_t gid; + + gid = atoi (argv[i]); + printf ("%d: %s\n", gid, group_member (gid) ? "yes" : "no"); + } + exit (0); +} + +#endif /* TEST */ diff --git a/gnu/hash.c b/gnu/hash.c index 8921b4f..c90285b 100644 --- a/gnu/hash.c +++ b/gnu/hash.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* hash - hashing table processing. - Copyright (C) 1998-2004, 2006-2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1998-2004, 2006-2007, 2009-2014 Free Software Foundation, Inc. Written by Jim Meyering, 1992. diff --git a/gnu/hash.h b/gnu/hash.h index 02d7e24..ee887cf 100644 --- a/gnu/hash.h +++ b/gnu/hash.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* hash - hashing table processing. - Copyright (C) 1998-1999, 2001, 2003, 2009-2013 Free Software Foundation, + Copyright (C) 1998-1999, 2001, 2003, 2009-2014 Free Software Foundation, Inc. Written by Jim Meyering , 1998. diff --git a/gnu/human.c b/gnu/human.c index be90515..93051af 100644 --- a/gnu/human.c +++ b/gnu/human.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* human.c -- print human readable file size - Copyright (C) 1996-2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/human.h b/gnu/human.h index 5c65b4a..a1f67b9 100644 --- a/gnu/human.h +++ b/gnu/human.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* human.h -- print human readable file size - Copyright (C) 1996-2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1996-2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/intprops.h b/gnu/intprops.h index 9c20544..8832000 100644 --- a/gnu/intprops.h +++ b/gnu/intprops.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* intprops.h -- properties of integer types - Copyright (C) 2001-2005, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2001-2005, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -91,7 +91,8 @@ /* Return 1 if the __typeof__ keyword works. This could be done by 'configure', but for now it's easier to do it by hand. */ -#if 2 <= __GNUC__ || defined __IBM__TYPEOF__ || 0x5110 <= __SUNPRO_C +#if (2 <= __GNUC__ || defined __IBM__TYPEOF__ \ + || (0x5110 <= __SUNPRO_C && !__STDC__)) # define _GL_HAVE___TYPEOF__ 1 #else # define _GL_HAVE___TYPEOF__ 0 diff --git a/gnu/inttostr.h b/gnu/inttostr.h index a65c6ab..d79b9e9 100644 --- a/gnu/inttostr.h +++ b/gnu/inttostr.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* inttostr.h -- convert integers to printable strings - Copyright (C) 2001-2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2001-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/inttypes.in.h b/gnu/inttypes.in.h index ba060dc..65f62d1 100644 --- a/gnu/inttypes.in.h +++ b/gnu/inttypes.in.h @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 2006-2013 Free Software Foundation, Inc. +/* Copyright (C) 2006-2014 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Derek Price. This file is part of gnulib. @@ -1107,12 +1107,22 @@ _GL_WARN_ON_USE (strtoimax, "strtoimax is unportable - " #endif #if @GNULIB_STRTOUMAX@ -# if !@HAVE_DECL_STRTOUMAX@ -# undef strtoumax +# if @REPLACE_STRTOUMAX@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef strtoumax +# define strtoumax rpl_strtoumax +# endif +_GL_FUNCDECL_RPL (strtoumax, uintmax_t, + (const char *, char **, int) _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (strtoumax, uintmax_t, (const char *, char **, int)); +# else +# if !@HAVE_DECL_STRTOUMAX@ +# undef strtoumax _GL_FUNCDECL_SYS (strtoumax, uintmax_t, (const char *, char **, int) _GL_ARG_NONNULL ((1))); -# endif +# endif _GL_CXXALIAS_SYS (strtoumax, uintmax_t, (const char *, char **, int)); +# endif _GL_CXXALIASWARN (strtoumax); #elif defined GNULIB_POSIXCHECK # undef strtoumax diff --git a/gnu/isatty.c b/gnu/isatty.c new file mode 100644 index 0000000..158b2ae --- /dev/null +++ b/gnu/isatty.c @@ -0,0 +1,83 @@ +/* -*- buffer-read-only: t -*- vi: set ro: */ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* isatty() replacement. + Copyright (C) 2012-2014 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include + +/* Specification. */ +#include + +/* This replacement is enabled on native Windows. */ + +#include + +/* Get declarations of the Win32 API functions. */ +#define WIN32_LEAN_AND_MEAN +#include + +#include "msvc-inval.h" + +/* Get _get_osfhandle(). */ +#include "msvc-nothrow.h" + +/* Optimized test whether a HANDLE refers to a console. + See . */ +#define IsConsoleHandle(h) (((intptr_t) (h) & 3) == 3) + +#if HAVE_MSVC_INVALID_PARAMETER_HANDLER +static int +_isatty_nothrow (int fd) +{ + int result; + + TRY_MSVC_INVAL + { + result = _isatty (fd); + } + CATCH_MSVC_INVAL + { + result = 0; + } + DONE_MSVC_INVAL; + + return result; +} +#else +# define _isatty_nothrow _isatty +#endif + +/* Determine whether FD refers to a console device. Return 1 if yes. + Return 0 and set errno if no. (ptsname_r relies on the errno value.) */ +int +isatty (int fd) +{ + HANDLE h = (HANDLE) _get_osfhandle (fd); + if (h == INVALID_HANDLE_VALUE) + { + errno = EBADF; + return 0; + } + /* _isatty (fd) tests whether GetFileType of the handle is FILE_TYPE_CHAR. + But it does not set errno when it returns 0. */ + if (_isatty_nothrow (fd)) + { + if (IsConsoleHandle (h)) + return 1; + } + errno = ENOTTY; + return 0; +} diff --git a/gnu/iswblank.c b/gnu/iswblank.c index 13f0f0b..543df06 100644 --- a/gnu/iswblank.c +++ b/gnu/iswblank.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Test wide character for being blank. - Copyright (C) 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2008-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/itold.c b/gnu/itold.c index 406763e..d5e44dd 100644 --- a/gnu/itold.c +++ b/gnu/itold.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Replacement for 'int' to 'long double' conversion routine. - Copyright (C) 2011-2013 Free Software Foundation, Inc. + Copyright (C) 2011-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify diff --git a/gnu/langinfo.in.h b/gnu/langinfo.in.h index 782a8fa..2fc1cf8 100644 --- a/gnu/langinfo.in.h +++ b/gnu/langinfo.in.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Substitute for and wrapper around . - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/lchown.c b/gnu/lchown.c index 99c794c..6f30c2c 100644 --- a/gnu/lchown.c +++ b/gnu/lchown.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Provide a stub lchown function for systems that lack it. - Copyright (C) 1998-1999, 2002, 2004, 2006-2007, 2009-2013 Free Software + Copyright (C) 1998-1999, 2002, 2004, 2006-2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/link.c b/gnu/link.c index f715846..c275301 100644 --- a/gnu/link.c +++ b/gnu/link.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Emulate link on platforms that lack it, namely native Windows platforms. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/linkat.c b/gnu/linkat.c index 5a5770c..2874205 100644 --- a/gnu/linkat.c +++ b/gnu/linkat.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Create a hard link relative to open directories. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/localcharset.c b/gnu/localcharset.c index 4f56dfa..c411de1 100644 --- a/gnu/localcharset.c +++ b/gnu/localcharset.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Determine a canonical name for the current locale's character encoding. - Copyright (C) 2000-2006, 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2000-2006, 2008-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -67,6 +67,11 @@ # include #endif +/* For MB_CUR_MAX_L */ +#if defined DARWIN7 +# include +#endif + #if ENABLE_RELOCATABLE # include "relocatable.h" #else @@ -547,7 +552,7 @@ locale_charset (void) #ifdef DARWIN7 /* Mac OS X sets MB_CUR_MAX to 1 when LC_ALL=C, and "UTF-8" (the default codeset) does not work when MB_CUR_MAX is 1. */ - if (strcmp (codeset, "UTF-8") == 0 && MB_CUR_MAX <= 1) + if (strcmp (codeset, "UTF-8") == 0 && MB_CUR_MAX_L (uselocale (NULL)) <= 1) codeset = "ASCII"; #endif diff --git a/gnu/localcharset.h b/gnu/localcharset.h index eacfd66..481cbb3 100644 --- a/gnu/localcharset.h +++ b/gnu/localcharset.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Determine a canonical name for the current locale's character encoding. - Copyright (C) 2000-2003, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2000-2003, 2009-2014 Free Software Foundation, Inc. This file is part of the GNU CHARSET Library. This program is free software; you can redistribute it and/or modify diff --git a/gnu/locale.in.h b/gnu/locale.in.h index 0e9272f..72bfcc2 100644 --- a/gnu/locale.in.h +++ b/gnu/locale.in.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A POSIX . - Copyright (C) 2007-2013 Free Software Foundation, Inc. + Copyright (C) 2007-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/localeconv.c b/gnu/localeconv.c index c7aa1a8..b674c83 100644 --- a/gnu/localeconv.c +++ b/gnu/localeconv.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Query locale dependent information for formatting numbers. - Copyright (C) 2012-2013 Free Software Foundation, Inc. + Copyright (C) 2012-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/lseek.c b/gnu/lseek.c index b5fdcca..40f01e1 100644 --- a/gnu/lseek.c +++ b/gnu/lseek.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* An lseek() function that detects pipes. - Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/lstat.c b/gnu/lstat.c index 8314b27..2cf429d 100644 --- a/gnu/lstat.c +++ b/gnu/lstat.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Work around a bug of lstat on some systems - Copyright (C) 1997-2006, 2008-2013 Free Software Foundation, Inc. + Copyright (C) 1997-2006, 2008-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/malloc.c b/gnu/malloc.c index 88792e0..83c5155 100644 --- a/gnu/malloc.c +++ b/gnu/malloc.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* malloc() function that is glibc compatible. - Copyright (C) 1997-1998, 2006-2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1997-1998, 2006-2007, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/malloca.c b/gnu/malloca.c index b6b223d..56294e6 100644 --- a/gnu/malloca.c +++ b/gnu/malloca.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Safe automatic memory allocation. - Copyright (C) 2003, 2006-2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2009-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software; you can redistribute it and/or modify diff --git a/gnu/malloca.h b/gnu/malloca.h index 8256889..09d25a3 100644 --- a/gnu/malloca.h +++ b/gnu/malloca.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Safe automatic memory allocation. - Copyright (C) 2003-2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2003-2007, 2009-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2003. This program is free software; you can redistribute it and/or modify diff --git a/gnu/mbchar.c b/gnu/mbchar.c index 2ec3522..b4ebd92 100644 --- a/gnu/mbchar.c +++ b/gnu/mbchar.c @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 2001, 2006, 2009-2013 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/mbchar.h b/gnu/mbchar.h index cadf157..4c95ccb 100644 --- a/gnu/mbchar.h +++ b/gnu/mbchar.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Multibyte character data type. - Copyright (C) 2001, 2005-2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2001, 2005-2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -158,6 +158,9 @@ #include #include +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif _GL_INLINE_HEADER_BEGIN #ifndef MBCHAR_INLINE # define MBCHAR_INLINE _GL_INLINE diff --git a/gnu/mbrtowc.c b/gnu/mbrtowc.c index 22022f3..50e37b9 100644 --- a/gnu/mbrtowc.c +++ b/gnu/mbrtowc.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Convert multibyte character to wide character. - Copyright (C) 1999-2002, 2005-2013 Free Software Foundation, Inc. + Copyright (C) 1999-2002, 2005-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/gnu/mbscasecmp.c b/gnu/mbscasecmp.c index 15f6b0d..b0e5871 100644 --- a/gnu/mbscasecmp.c +++ b/gnu/mbscasecmp.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Case-insensitive string comparison function. - Copyright (C) 1998-1999, 2005-2013 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2005, based on earlier glibc code. diff --git a/gnu/mbsinit.c b/gnu/mbsinit.c index 5db59b6..c27330a 100644 --- a/gnu/mbsinit.c +++ b/gnu/mbsinit.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Test for initial conversion state. - Copyright (C) 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2008-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/gnu/mbsrtowcs-impl.h b/gnu/mbsrtowcs-impl.h index a73fedf..444c664 100644 --- a/gnu/mbsrtowcs-impl.h +++ b/gnu/mbsrtowcs-impl.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Convert string to wide string. - Copyright (C) 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2008-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/gnu/mbsrtowcs-state.c b/gnu/mbsrtowcs-state.c index cb5b164..becfd99 100644 --- a/gnu/mbsrtowcs-state.c +++ b/gnu/mbsrtowcs-state.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Convert string to wide string. - Copyright (C) 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2008-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/gnu/mbsrtowcs.c b/gnu/mbsrtowcs.c index 8b265f5..e0f9bd1 100644 --- a/gnu/mbsrtowcs.c +++ b/gnu/mbsrtowcs.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Convert string to wide string. - Copyright (C) 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2008-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/gnu/mbtowc-impl.h b/gnu/mbtowc-impl.h index e8ea212..08eced8 100644 --- a/gnu/mbtowc-impl.h +++ b/gnu/mbtowc-impl.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Convert multibyte character to wide character. - Copyright (C) 2011-2013 Free Software Foundation, Inc. + Copyright (C) 2011-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify diff --git a/gnu/mbtowc.c b/gnu/mbtowc.c index 9019b98..10fcb23 100644 --- a/gnu/mbtowc.c +++ b/gnu/mbtowc.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Convert multibyte character to wide character. - Copyright (C) 2011-2013 Free Software Foundation, Inc. + Copyright (C) 2011-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify diff --git a/gnu/mbuiter.h b/gnu/mbuiter.h index 1dd87f7..e886e93 100644 --- a/gnu/mbuiter.h +++ b/gnu/mbuiter.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Iterating through multibyte strings: macros for multi-byte encodings. - Copyright (C) 2001, 2005, 2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2001, 2005, 2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -108,6 +108,9 @@ #include "mbchar.h" #include "strnlen1.h" +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif _GL_INLINE_HEADER_BEGIN #ifndef MBUITER_INLINE # define MBUITER_INLINE _GL_INLINE diff --git a/gnu/memchr.c b/gnu/memchr.c index a623ba5..5a71e2d 100644 --- a/gnu/memchr.c +++ b/gnu/memchr.c @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2013 +/* Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2004, 2006, 2008-2014 Free Software Foundation, Inc. Based on strlen implementation by Torbjorn Granlund (tege@sics.se), diff --git a/gnu/mempcpy.c b/gnu/mempcpy.c index db99441..2a075d4 100644 --- a/gnu/mempcpy.c +++ b/gnu/mempcpy.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Copy memory area and return pointer after last written byte. - Copyright (C) 2003, 2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2003, 2007, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/memrchr.c b/gnu/memrchr.c index 984ad52..4ad82bb 100644 --- a/gnu/memrchr.c +++ b/gnu/memrchr.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* memrchr -- find the last occurrence of a byte in a memory block - Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2013 Free Software + Copyright (C) 1991, 1993, 1996-1997, 1999-2000, 2003-2014 Free Software Foundation, Inc. Based on strlen implementation by Torbjorn Granlund (tege@sics.se), diff --git a/gnu/mkdir.c b/gnu/mkdir.c index e3816d6..38f1858 100644 --- a/gnu/mkdir.c +++ b/gnu/mkdir.c @@ -3,7 +3,7 @@ /* On some systems, mkdir ("foo/", 0700) fails because of the trailing slash. On those systems, this wrapper removes the trailing slash. - Copyright (C) 2001, 2003, 2006, 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2006, 2008-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/mkdirat.c b/gnu/mkdirat.c index 8975530..8f42837 100644 --- a/gnu/mkdirat.c +++ b/gnu/mkdirat.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* fd-relative mkdir - Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/mkdtemp.c b/gnu/mkdtemp.c index f5ae4d4..f70e18c 100644 --- a/gnu/mkdtemp.c +++ b/gnu/mkdtemp.c @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 1999, 2001-2003, 2006-2007, 2009-2013 Free Software +/* Copyright (C) 1999, 2001-2003, 2006-2007, 2009-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/gnu/mkfifo.c b/gnu/mkfifo.c index 5c3b497..31e8059 100644 --- a/gnu/mkfifo.c +++ b/gnu/mkfifo.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Create a named fifo. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/mkfifoat.c b/gnu/mkfifoat.c index 5c0b8c5..39fdcc8 100644 --- a/gnu/mkfifoat.c +++ b/gnu/mkfifoat.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Create a named fifo relative to an open directory. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/mknod.c b/gnu/mknod.c index ff25d89..79f35af 100644 --- a/gnu/mknod.c +++ b/gnu/mknod.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Create a device inode. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/mknodat.c b/gnu/mknodat.c index f5d0e47..0110423 100644 --- a/gnu/mknodat.c +++ b/gnu/mknodat.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Create an inode relative to an open directory. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/mktime.c b/gnu/mktime.c index e703cd2..470ebaa 100644 --- a/gnu/mktime.c +++ b/gnu/mktime.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Convert a 'struct tm' to a time_t value. - Copyright (C) 1993-2013 Free Software Foundation, Inc. + Copyright (C) 1993-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Paul Eggert . diff --git a/gnu/modechange.c b/gnu/modechange.c index 4d003c0..17d38b4 100644 --- a/gnu/modechange.c +++ b/gnu/modechange.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* modechange.c -- file mode manipulation - Copyright (C) 1989-1990, 1997-1999, 2001, 2003-2006, 2009-2013 Free Software + Copyright (C) 1989-1990, 1997-1999, 2001, 2003-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -222,12 +222,12 @@ mode_compile (char const *mode_string) { octal_mode = 8 * octal_mode + *p++ - '0'; if (ALLM < octal_mode) - return NULL; + goto invalid; } while ('0' <= *p && *p < '8'); if (affected || (*p && *p != ',')) - return NULL; + goto invalid; affected = mentioned = CHMOD_MODE_BITS; value = octal_to_mode (octal_mode); flag = MODE_ORDINARY_CHANGE; diff --git a/gnu/modechange.h b/gnu/modechange.h index 3efc644..774cb10 100644 --- a/gnu/modechange.h +++ b/gnu/modechange.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* modechange.h -- definitions for file mode manipulation - Copyright (C) 1989-1990, 1997, 2003-2006, 2009-2013 Free Software + Copyright (C) 1989-1990, 1997, 2003-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/msvc-inval.c b/gnu/msvc-inval.c index 9efed19..0babb47 100644 --- a/gnu/msvc-inval.c +++ b/gnu/msvc-inval.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Invalid parameter handler for MSVC runtime libraries. - Copyright (C) 2011-2013 Free Software Foundation, Inc. + Copyright (C) 2011-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/msvc-inval.h b/gnu/msvc-inval.h index e47789f..169da8d 100644 --- a/gnu/msvc-inval.h +++ b/gnu/msvc-inval.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Invalid parameter handler for MSVC runtime libraries. - Copyright (C) 2011-2013 Free Software Foundation, Inc. + Copyright (C) 2011-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/msvc-nothrow.c b/gnu/msvc-nothrow.c index 84f1355..5603cab 100644 --- a/gnu/msvc-nothrow.c +++ b/gnu/msvc-nothrow.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Wrappers that don't throw invalid parameter notifications with MSVC runtime libraries. - Copyright (C) 2011-2013 Free Software Foundation, Inc. + Copyright (C) 2011-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/msvc-nothrow.h b/gnu/msvc-nothrow.h index d8e2bcb..58caa1a 100644 --- a/gnu/msvc-nothrow.h +++ b/gnu/msvc-nothrow.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Wrappers that don't throw invalid parameter notifications with MSVC runtime libraries. - Copyright (C) 2011-2013 Free Software Foundation, Inc. + Copyright (C) 2011-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/nl_langinfo.c b/gnu/nl_langinfo.c index bf3aa8f..f422732 100644 --- a/gnu/nl_langinfo.c +++ b/gnu/nl_langinfo.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* nl_langinfo() replacement: query locale dependent information. - Copyright (C) 2007-2013 Free Software Foundation, Inc. + Copyright (C) 2007-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/obstack.c b/gnu/obstack.c index e2b80b6..1aba44c 100644 --- a/gnu/obstack.c +++ b/gnu/obstack.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* obstack.c - subroutines used implicitly by object stack macros - Copyright (C) 1988-1994, 1996-2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1988-1994, 1996-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -315,7 +315,7 @@ libc_hidden_def (_obstack_newchunk) /* Suppress -Wmissing-prototypes warning. We don't want to declare this in obstack.h because it is just for debugging. */ -int _obstack_allocated_p (struct obstack *h, void *obj); +int _obstack_allocated_p (struct obstack *h, void *obj) _GL_ATTRIBUTE_PURE; int _obstack_allocated_p (struct obstack *h, void *obj) diff --git a/gnu/obstack.h b/gnu/obstack.h index b5f0bb4..1897b32 100644 --- a/gnu/obstack.h +++ b/gnu/obstack.h @@ -1,22 +1,22 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* obstack.h - object stack macros - Copyright (C) 1988-1994, 1996-1999, 2003-2006, 2009-2013 Free Software - Foundation, Inc. + Copyright (C) 1988-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program. If not, see . */ + You should have received a copy of the GNU General Public + License along with this program; if not, see + . */ /* Summary: @@ -185,7 +185,7 @@ extern int _obstack_begin (struct obstack *, int, int, extern int _obstack_begin_1 (struct obstack *, int, int, void *(*) (void *, long), void (*) (void *, void *), void *); -extern int _obstack_memory_used (struct obstack *); +extern int _obstack_memory_used (struct obstack *) _GL_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'. */ @@ -503,9 +503,9 @@ __extension__ \ ( (h)->temp.tempint = (char *) (obj) - (char *) (h)->chunk, \ ((((h)->temp.tempint > 0 \ && (h)->temp.tempint < (h)->chunk_limit - (char *) (h)->chunk)) \ - ? (int) ((h)->next_free = (h)->object_base \ - = (h)->temp.tempint + (char *) (h)->chunk) \ - : (((__obstack_free) ((h), (h)->temp.tempint + (char *) (h)->chunk), 0), 0))) + ? (void) ((h)->next_free = (h)->object_base \ + = (h)->temp.tempint + (char *) (h)->chunk) \ + : (__obstack_free) (h, (h)->temp.tempint + (char *) (h)->chunk))) #endif /* not __GNUC__ */ diff --git a/gnu/open.c b/gnu/open.c index 61a950f..06e6020 100644 --- a/gnu/open.c +++ b/gnu/open.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Open a descriptor to a file. - Copyright (C) 2007-2013 Free Software Foundation, Inc. + Copyright (C) 2007-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/openat-die.c b/gnu/openat-die.c index b06472a..747ec39 100644 --- a/gnu/openat-die.c +++ b/gnu/openat-die.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Report a save- or restore-cwd failure in our openat replacement and then exit. - Copyright (C) 2005-2006, 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2008-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/openat-priv.h b/gnu/openat-priv.h index 26983e1..d62b53c 100644 --- a/gnu/openat-priv.h +++ b/gnu/openat-priv.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Internals for openat-like functions. - Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/openat-proc.c b/gnu/openat-proc.c index a5837fc..b7bf4ea 100644 --- a/gnu/openat-proc.c +++ b/gnu/openat-proc.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Create /proc/self/fd-related names for subfiles of open directories. - Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/openat.c b/gnu/openat.c index cea1b47..c044dfd 100644 --- a/gnu/openat.c +++ b/gnu/openat.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* provide a replacement openat function - Copyright (C) 2004-2013 Free Software Foundation, Inc. + Copyright (C) 2004-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/openat.h b/gnu/openat.h index 4143e9c..ada744a 100644 --- a/gnu/openat.h +++ b/gnu/openat.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* provide a replacement openat function - Copyright (C) 2004-2006, 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2004-2006, 2008-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,6 +28,9 @@ #include #include +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif _GL_INLINE_HEADER_BEGIN #if !HAVE_OPENAT diff --git a/gnu/opendir-safer.c b/gnu/opendir-safer.c index 98272f4..e562751 100644 --- a/gnu/opendir-safer.c +++ b/gnu/opendir-safer.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Invoke opendir, but avoid some glitches. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/opendir.c b/gnu/opendir.c index a967782..40f06dd 100644 --- a/gnu/opendir.c +++ b/gnu/opendir.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Start reading the entries of a directory. - Copyright (C) 2006-2013 Free Software Foundation, Inc. + Copyright (C) 2006-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/parse-datetime.c b/gnu/parse-datetime.c index 972632e..3663bd9 100644 --- a/gnu/parse-datetime.c +++ b/gnu/parse-datetime.c @@ -70,7 +70,7 @@ /* Parse a string into an internal time stamp. - Copyright (C) 1999-2000, 2002-2013 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -3296,8 +3296,6 @@ parse_datetime (struct timespec *result, char const *p, char tz1buf[TZBUFSIZE]; bool large_tz = TZBUFSIZE < tzsize; bool setenv_ok; - /* Free tz0, in case this is the 2nd or subsequent time through. */ - free (tz0); tz0 = get_tz (tz0buf); z = tz1 = large_tz ? xmalloc (tzsize) : tz1buf; for (s = tzbase; *s != '"'; s++) @@ -3309,7 +3307,12 @@ parse_datetime (struct timespec *result, char const *p, if (!setenv_ok) goto fail; tz_was_altered = true; + p = s + 1; + while (c = *p, c_isspace (c)) + p++; + + break; } } diff --git a/gnu/parse-datetime.h b/gnu/parse-datetime.h index 47fe4de..805fc78 100644 --- a/gnu/parse-datetime.h +++ b/gnu/parse-datetime.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Parse a string into an internal time stamp. - Copyright (C) 1995, 1997-1998, 2003-2004, 2007, 2009-2013 Free Software + Copyright (C) 1995, 1997-1998, 2003-2004, 2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/parse-datetime.y b/gnu/parse-datetime.y index 4dce7fa..0ba0a52 100644 --- a/gnu/parse-datetime.y +++ b/gnu/parse-datetime.y @@ -1,7 +1,7 @@ %{ /* Parse a string into an internal time stamp. - Copyright (C) 1999-2000, 2002-2013 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1303,8 +1303,6 @@ parse_datetime (struct timespec *result, char const *p, char tz1buf[TZBUFSIZE]; bool large_tz = TZBUFSIZE < tzsize; bool setenv_ok; - /* Free tz0, in case this is the 2nd or subsequent time through. */ - free (tz0); tz0 = get_tz (tz0buf); z = tz1 = large_tz ? xmalloc (tzsize) : tz1buf; for (s = tzbase; *s != '"'; s++) @@ -1316,7 +1314,12 @@ parse_datetime (struct timespec *result, char const *p, if (!setenv_ok) goto fail; tz_was_altered = true; + p = s + 1; + while (c = *p, c_isspace (c)) + p++; + + break; } } diff --git a/gnu/pathmax.h b/gnu/pathmax.h index 1ca0efd..ebd72f8 100644 --- a/gnu/pathmax.h +++ b/gnu/pathmax.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Define PATH_MAX somehow. Requires sys/types.h. - Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2013 Free Software + Copyright (C) 1992, 1999, 2001, 2003, 2005, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/gnu/pipe-safer.c b/gnu/pipe-safer.c index 68c01cd..e71f828 100644 --- a/gnu/pipe-safer.c +++ b/gnu/pipe-safer.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Invoke pipe, but avoid some glitches. - Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/posix_openpt.c b/gnu/posix_openpt.c new file mode 100644 index 0000000..de89f82 --- /dev/null +++ b/gnu/posix_openpt.c @@ -0,0 +1,110 @@ +/* -*- buffer-read-only: t -*- vi: set ro: */ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* Open the master side of a pseudo-terminal. + Copyright (C) 2010-2014 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include + +/* Specification. */ +#include + +#include +#include +#if defined __OpenBSD__ +# include +# include +#endif + +/* posix_openpt() is already provided on + glibc >= 2.2.1 (but is a stub on GNU/Hurd), + Mac OS X >= 10.4, + FreeBSD >= 5.1 (lived in src/lib/libc/stdlib/grantpt.c before 8.0), + NetBSD >= 3.0, + AIX >= 5.2, HP-UX >= 11.31, Solaris >= 10, Cygwin >= 1.7. + Thus, this replacement function is compiled on + Mac OS X 10.3, OpenBSD 4.9, Minix 3.1.8, + AIX 5.1, HP-UX 11.23, IRIX 6.5, OSF/1 5.1, Solaris 9, + Cygwin 1.5.x, mingw, MSVC 9, Interix 3.5, BeOS. + Among these: + - AIX has /dev/ptc. + - HP-UX 10..11, IRIX 6.5, OSF/1 5.1, Solaris 2.6..9, Cygwin 1.5 + have /dev/ptmx. + - HP-UX 10..11 also has /dev/ptym/clone, but this should not be needed. + - OpenBSD 4.9 has /dev/ptm and the PTMGET ioctl. + - Minix 3.1.8 have a list of pseudo-terminal devices in /dev. + - On native Windows, there are no ttys at all. */ + +int +posix_openpt (int flags) +{ + int master; + +#ifdef _AIX /* AIX */ + + master = open ("/dev/ptc", flags); + +#elif (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__ /* mingw */ + + /* Mingw lacks pseudo-terminals altogether. */ + master = -1; + errno = ENOSYS; + +#elif defined __OpenBSD__ + + /* On OpenBSD, master and slave of a pseudo-terminal are allocated together, + by opening /dev/ptm and applying the PTMGET ioctl to it. */ + int fd; + struct ptmget data; + + fd = open (PATH_PTMDEV, O_RDWR); + if (fd >= 0) + { + if (ioctl (fd, PTMGET, &data) >= 0) + { + master = data.cfd; + close (data.sfd); + close (fd); + } + else + { + int saved_errno = errno; + close (fd); + errno = saved_errno; + master = -1; + } + } + else + master = -1; + +#else /* Mac OS X, Minix, HP-UX, IRIX, OSF/1, Solaris 9, Cygwin 1.5 */ + + /* Most systems that lack posix_openpt() have /dev/ptmx. */ + master = open ("/dev/ptmx", flags); + + /* If all this does not work, we could try to open, one by one: + - On Mac OS X: /dev/pty[p-w][0-9a-f] + - On *BSD: /dev/pty[p-sP-S][0-9a-v] + - On Minix: /dev/pty[p-q][0-9a-f] + - On AIX: /dev/ptyp[0-9a-f] + - On HP-UX: /dev/pty[p-r][0-9a-f] + - On OSF/1: /dev/pty[p-q][0-9a-f] + - On Solaris: /dev/pty[p-r][0-9a-f] + */ + +#endif + + return master; +} diff --git a/gnu/printf-args.c b/gnu/printf-args.c index cb6a93d..0fd2783 100644 --- a/gnu/printf-args.c +++ b/gnu/printf-args.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Decomposed printf argument list. - Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2013 Free Software + Copyright (C) 1999, 2002-2003, 2005-2007, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/gnu/printf-args.h b/gnu/printf-args.h index 1ed8ebd..a867691 100644 --- a/gnu/printf-args.h +++ b/gnu/printf-args.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Decomposed printf argument list. - Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2013 Free Software + Copyright (C) 1999, 2002-2003, 2006-2007, 2011-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/gnu/printf-parse.c b/gnu/printf-parse.c index 1320fcd..4aebe25 100644 --- a/gnu/printf-parse.c +++ b/gnu/printf-parse.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Formatted output to strings. - Copyright (C) 1999-2000, 2002-2003, 2006-2013 Free Software Foundation, Inc. + Copyright (C) 1999-2000, 2002-2003, 2006-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/printf-parse.h b/gnu/printf-parse.h index ab41213..a22ba14 100644 --- a/gnu/printf-parse.h +++ b/gnu/printf-parse.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Parse printf format string. - Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2013 Free Software + Copyright (C) 1999, 2002-2003, 2005, 2007, 2010-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff --git a/gnu/priv-set.c b/gnu/priv-set.c index c09fb0e..223af71 100644 --- a/gnu/priv-set.c +++ b/gnu/priv-set.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Query, remove, or restore a Solaris privilege. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/priv-set.h b/gnu/priv-set.h index 44afc8d..be59285 100644 --- a/gnu/priv-set.h +++ b/gnu/priv-set.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Query, remove, or restore a Solaris privilege. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,6 +19,9 @@ Written by David Bartley. */ +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif _GL_INLINE_HEADER_BEGIN #ifndef PRIV_SET_INLINE # define PRIV_SET_INLINE _GL_INLINE diff --git a/gnu/progname.c b/gnu/progname.c index 1401a84..863147a 100644 --- a/gnu/progname.c +++ b/gnu/progname.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Program name management. - Copyright (C) 2001-2003, 2005-2013 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify diff --git a/gnu/progname.h b/gnu/progname.h index ecf83fd..39d1ea4 100644 --- a/gnu/progname.h +++ b/gnu/progname.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Program name management. - Copyright (C) 2001-2004, 2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2006, 2009-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software: you can redistribute it and/or modify diff --git a/gnu/ptsname.c b/gnu/ptsname.c new file mode 100644 index 0000000..dcc6cda --- /dev/null +++ b/gnu/ptsname.c @@ -0,0 +1,34 @@ +/* -*- buffer-read-only: t -*- vi: set ro: */ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* Determine name of the slave side of a pseudo-terminal. + Copyright (C) 1998, 2002, 2010-2014 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include + +#include + +/* Static buffer for 'ptsname'. */ +static char buffer[64]; + + +/* Return the pathname of the pseudo terminal slave associated with + the master FD is open on, or NULL on errors. + The returned storage is good until the next call to this function. */ +char * +ptsname (int fd) +{ + return ptsname_r (fd, buffer, sizeof (buffer)) != 0 ? NULL : buffer; +} diff --git a/gnu/ptsname_r.c b/gnu/ptsname_r.c new file mode 100644 index 0000000..203fcce --- /dev/null +++ b/gnu/ptsname_r.c @@ -0,0 +1,191 @@ +/* -*- buffer-read-only: t -*- vi: set ro: */ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* Determine name of the slave side of a pseudo-terminal. + Copyright (C) 1998, 2002, 2010-2014 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include + +#include + +#include +#include +#include +#include +#include + +#ifdef _LIBC +# include +#else +# ifndef _PATH_TTY +# define _PATH_TTY "/dev/tty" +# endif +# ifndef _PATH_DEV +# define _PATH_DEV "/dev/" +# endif + +# define __set_errno(e) errno = (e) +# define __isatty isatty +# define __stat stat +# define __ttyname_r ttyname_r +# define __ptsname_r ptsname_r + +#endif + +#ifdef __sun +/* Get ioctl() and 'struct strioctl'. */ +# include +/* Get ISPTM. */ +# include +# include +/* Get the major, minor macros. */ +# include +# include +#endif + +#if defined _AIX || defined __osf__ +/* Get ioctl(), ISPTM. */ +# include +/* Get the major, minor macros. */ +# include +# include +#endif + + +/* Store at most BUFLEN characters of the pathname of the slave pseudo + terminal associated with the master FD is open on in BUF. + Return 0 on success, otherwise an error number. */ +int +__ptsname_r (int fd, char *buf, size_t buflen) +{ + int save_errno = errno; + int err; + struct stat st; + + if (buf == NULL) + { + __set_errno (EINVAL); + return EINVAL; + } + +#if defined __sun /* Solaris */ + if (fstat (fd, &st) < 0) + return errno; + if (!(S_ISCHR (st.st_mode) && major (st.st_rdev) == 0)) + { + errno = ENOTTY; + return errno; + } + { + /* Master ptys can be recognized through a STREAMS ioctl. See + "STREAMS-based Pseudo-Terminal Subsystem" + + and "STREAMS ioctl commands" + + */ + struct strioctl ioctl_arg; + ioctl_arg.ic_cmd = ISPTM; + ioctl_arg.ic_timout = 0; + ioctl_arg.ic_len = 0; + ioctl_arg.ic_dp = NULL; + + if (ioctl (fd, I_STR, &ioctl_arg) < 0) + { + errno = ENOTTY; + return errno; + } + } + { + char tmpbuf[9 + 10 + 1]; + int n = sprintf (tmpbuf, "/dev/pts/%u", minor (st.st_rdev)); + if (n >= buflen) + { + errno = ERANGE; + return errno; + } + memcpy (buf, tmpbuf, n + 1); + } +#elif defined _AIX || defined __osf__ /* AIX, OSF/1 */ + /* This implementation returns /dev/pts/N, like ptsname() does. + Whereas the generic implementation below returns /dev/ttypN. + Both are correct, but let's be consistent with ptsname(). */ + if (fstat (fd, &st) < 0) + return errno; + if (!S_ISCHR (st.st_mode)) + { + errno = ENOTTY; + return errno; + } + { + int ret; + int dev; + char tmpbuf[9 + 10 + 1]; + int n; +# ifdef _AIX + ret = ioctl (fd, ISPTM, &dev); +# endif +# ifdef __osf__ + ret = ioctl (fd, ISPTM, NULL); + dev = ret; +# endif + if (ret < 0) + { + errno = ENOTTY; + return errno; + } + n = sprintf (tmpbuf, "/dev/pts/%u", minor (dev)); + if (n >= buflen) + { + errno = ERANGE; + return errno; + } + memcpy (buf, tmpbuf, n + 1); + } +#else + if (!__isatty (fd)) + { +#if ISATTY_FAILS_WITHOUT_SETTING_ERRNO && defined F_GETFL /* IRIX, Solaris */ + /* Set errno. */ + if (fcntl (fd, F_GETFL) != -1) + errno = ENOTTY; +#else + /* We rely on isatty to set errno properly (i.e. EBADF or ENOTTY). */ +#endif + return errno; + } + + if (buflen < strlen (_PATH_TTY) + 3) + { + __set_errno (ERANGE); + return ERANGE; + } + + err = __ttyname_r (fd, buf, buflen); + if (err != 0) + { + __set_errno (err); + return errno; + } + + if (strncmp(buf, "/dev/pts/", strlen("/dev/pts/")) != 0) + buf[sizeof (_PATH_DEV) - 1] = 't'; +#endif + + if (__stat (buf, &st) < 0) + return errno; + + __set_errno (save_errno); + return 0; +} diff --git a/gnu/qcopy-acl.c b/gnu/qcopy-acl.c index 7ef0938..53e0ed5 100644 --- a/gnu/qcopy-acl.c +++ b/gnu/qcopy-acl.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* copy-acl.c - copy access control list from one file to another file - Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/qset-acl.c b/gnu/qset-acl.c index 2bef393..570c9eb 100644 --- a/gnu/qset-acl.c +++ b/gnu/qset-acl.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* qset-acl.c - set access control list equivalent to a mode - Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/quote.h b/gnu/quote.h index c25a1ab..f84e4fd 100644 --- a/gnu/quote.h +++ b/gnu/quote.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* quote.h - prototypes for quote.c - Copyright (C) 1998-2001, 2003, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1998-2001, 2003, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/quotearg.c b/gnu/quotearg.c index 9c0648f..8aa2ed5 100644 --- a/gnu/quotearg.c +++ b/gnu/quotearg.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* quotearg.c - quote arguments for output - Copyright (C) 1998-2002, 2004-2013 Free Software Foundation, Inc. + Copyright (C) 1998-2002, 2004-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -628,7 +628,7 @@ quotearg_buffer_restyled (char *buffer, size_t buffersize, if (! ((backslash_escapes || elide_outer_quotes) && quote_these_too - && quote_these_too[c / INT_BITS] & (1 << (c % INT_BITS))) + && quote_these_too[c / INT_BITS] >> (c % INT_BITS) & 1) && !is_right_quote) goto store_c; diff --git a/gnu/quotearg.h b/gnu/quotearg.h index 44dff4e..f9e58dd 100644 --- a/gnu/quotearg.h +++ b/gnu/quotearg.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* quotearg.h - quote arguments for output - Copyright (C) 1998-2002, 2004, 2006, 2008-2013 Free Software Foundation, + Copyright (C) 1998-2002, 2004, 2006, 2008-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/raise.c b/gnu/raise.c index 97295dd..97fa3aa 100644 --- a/gnu/raise.c +++ b/gnu/raise.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Provide a non-threads replacement for the POSIX raise function. - Copyright (C) 2002-2003, 2005-2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/rawmemchr.c b/gnu/rawmemchr.c index cddc6e6..9775af3 100644 --- a/gnu/rawmemchr.c +++ b/gnu/rawmemchr.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Searching in a string. - Copyright (C) 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2008-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/read.c b/gnu/read.c index 13e4d44..0ccc1e4 100644 --- a/gnu/read.c +++ b/gnu/read.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* POSIX compatible read() function. - Copyright (C) 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2008-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2011. This program is free software: you can redistribute it and/or modify diff --git a/gnu/readdir.c b/gnu/readdir.c index ab14942..ec01463 100644 --- a/gnu/readdir.c +++ b/gnu/readdir.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Read the next entry of a directory. - Copyright (C) 2011-2013 Free Software Foundation, Inc. + Copyright (C) 2011-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/readlink.c b/gnu/readlink.c index dd8c124..d0fe2cf 100644 --- a/gnu/readlink.c +++ b/gnu/readlink.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Stub for readlink(). - Copyright (C) 2003-2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2003-2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/readlinkat.c b/gnu/readlinkat.c index 6cdf778..83355ba 100644 --- a/gnu/readlinkat.c +++ b/gnu/readlinkat.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Read a symlink relative to an open directory. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/realloc.c b/gnu/realloc.c index 3a4fe28..655dc11 100644 --- a/gnu/realloc.c +++ b/gnu/realloc.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* realloc() function that is glibc compatible. - Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2013 Free Software + Copyright (C) 1997, 2003-2004, 2006-2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/ref-add.sin b/gnu/ref-add.sin index 112bcdc..0e14022 100644 --- a/gnu/ref-add.sin +++ b/gnu/ref-add.sin @@ -1,6 +1,6 @@ # Add this package to a list of references stored in a text file. # -# Copyright (C) 2000, 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2000, 2009-2014 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/gnu/ref-del.sin b/gnu/ref-del.sin index 6f73868..2dbcf7b 100644 --- a/gnu/ref-del.sin +++ b/gnu/ref-del.sin @@ -1,6 +1,6 @@ # Remove this package from a list of references stored in a text file. # -# Copyright (C) 2000, 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2000, 2009-2014 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/gnu/regcomp.c b/gnu/regcomp.c index 447262f..659aff5 100644 --- a/gnu/regcomp.c +++ b/gnu/regcomp.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Extended regular expression matching and search library. - Copyright (C) 2002-2013 Free Software Foundation, Inc. + Copyright (C) 2002-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . diff --git a/gnu/regex.c b/gnu/regex.c index 990fe85..0b1a651 100644 --- a/gnu/regex.c +++ b/gnu/regex.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Extended regular expression matching and search library. - Copyright (C) 2002-2013 Free Software Foundation, Inc. + Copyright (C) 2002-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . diff --git a/gnu/regex.h b/gnu/regex.h index dbd2b1b..5bb06ac 100644 --- a/gnu/regex.h +++ b/gnu/regex.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Definitions for data structures and routines for the regular expression library. - Copyright (C) 1985, 1989-1993, 1995-1998, 2000-2003, 2005-2013 Free Software + Copyright (C) 1985, 1989-1993, 1995-1998, 2000-2003, 2005-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/gnu/regex_internal.c b/gnu/regex_internal.c index 4f18e9d..056bf72 100644 --- a/gnu/regex_internal.c +++ b/gnu/regex_internal.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Extended regular expression matching and search library. - Copyright (C) 2002-2013 Free Software Foundation, Inc. + Copyright (C) 2002-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . @@ -313,12 +313,11 @@ build_wcs_upper_buffer (re_string_t *pstr) + byte_idx), remain_len, &pstr->cur_state); if (BE (mbclen < (size_t) -2, 1)) { - wchar_t wcu = wc; - if (iswlower (wc)) + wchar_t wcu = towupper (wc); + if (wcu != wc) { size_t mbcdlen; - wcu = towupper (wc); mbcdlen = wcrtomb (buf, wcu, &prev_st); if (BE (mbclen == mbcdlen, 1)) memcpy (pstr->mbs + byte_idx, buf, mbclen); @@ -383,12 +382,11 @@ build_wcs_upper_buffer (re_string_t *pstr) mbclen = __mbrtowc (&wc, p, remain_len, &pstr->cur_state); if (BE (mbclen < (size_t) -2, 1)) { - wchar_t wcu = wc; - if (iswlower (wc)) + wchar_t wcu = towupper (wc); + if (wcu != wc) { size_t mbcdlen; - wcu = towupper (wc); mbcdlen = wcrtomb ((char *) buf, wcu, &prev_st); if (BE (mbclen == mbcdlen, 1)) memcpy (pstr->mbs + byte_idx, buf, mbclen); @@ -540,10 +538,7 @@ build_upper_buffer (re_string_t *pstr) int ch = pstr->raw_mbs[pstr->raw_mbs_idx + char_idx]; if (BE (pstr->trans != NULL, 0)) ch = pstr->trans[ch]; - if (islower (ch)) - pstr->mbs[char_idx] = toupper (ch); - else - pstr->mbs[char_idx] = ch; + pstr->mbs[char_idx] = toupper (ch); } pstr->valid_len = char_idx; pstr->valid_raw_len = char_idx; diff --git a/gnu/regex_internal.h b/gnu/regex_internal.h index f2d8231..32ec047 100644 --- a/gnu/regex_internal.h +++ b/gnu/regex_internal.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Extended regular expression matching and search library. - Copyright (C) 2002-2013 Free Software Foundation, Inc. + Copyright (C) 2002-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . @@ -74,8 +74,9 @@ #else # define lock_define(name) # define lock_init(lock) 0 -# define lock_fini(lock) 0 -# define lock_lock(lock) ((void) 0) +# define lock_fini(lock) ((void) 0) + /* The 'dfa' avoids an "unused variable 'dfa'" warning from GCC. */ +# define lock_lock(lock) ((void) dfa) # define lock_unlock(lock) ((void) 0) #endif @@ -111,7 +112,7 @@ # define gettext_noop(String) String #endif -#if (defined MB_CUR_MAX && HAVE_WCTYPE_H && HAVE_ISWCTYPE && HAVE_WCSCOLL) || _LIBC +#if (defined MB_CUR_MAX && HAVE_WCTYPE_H && HAVE_ISWCTYPE) || _LIBC # define RE_ENABLE_I18N #endif diff --git a/gnu/regexec.c b/gnu/regexec.c index 4105288..168ad78 100644 --- a/gnu/regexec.c +++ b/gnu/regexec.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Extended regular expression matching and search library. - Copyright (C) 2002-2013 Free Software Foundation, Inc. + Copyright (C) 2002-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa . diff --git a/gnu/rename.c b/gnu/rename.c index 067a5ac..025f882 100644 --- a/gnu/rename.c +++ b/gnu/rename.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Work around rename bugs in some systems. - Copyright (C) 2001-2003, 2005-2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2001-2003, 2005-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/renameat.c b/gnu/renameat.c index 47e8f75..1042a55 100644 --- a/gnu/renameat.c +++ b/gnu/renameat.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Rename a file relative to open directories. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/rewinddir.c b/gnu/rewinddir.c index 62fa874..8d8950f 100644 --- a/gnu/rewinddir.c +++ b/gnu/rewinddir.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Restart reading the entries of a directory from the beginning. - Copyright (C) 2011-2013 Free Software Foundation, Inc. + Copyright (C) 2011-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/rmdir.c b/gnu/rmdir.c index 8a1c71d..3b1e19f 100644 --- a/gnu/rmdir.c +++ b/gnu/rmdir.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Work around rmdir bugs. - Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2013 Free Software + Copyright (C) 1988, 1990, 1999, 2003-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/root-uid.h b/gnu/root-uid.h index f7fef50..d05bdd4 100644 --- a/gnu/root-uid.h +++ b/gnu/root-uid.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* The user ID that always has appropriate privileges in the POSIX sense. - Copyright 2012-2013 Free Software Foundation, Inc. + Copyright 2012-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/rpmatch.c b/gnu/rpmatch.c index 0eddb55..04caae2 100644 --- a/gnu/rpmatch.c +++ b/gnu/rpmatch.c @@ -3,7 +3,7 @@ /* Determine whether string value is affirmation or negative response according to current locale's data. - Copyright (C) 1996, 1998, 2000, 2002-2003, 2006-2013 Free Software + Copyright (C) 1996, 1998, 2000, 2002-2003, 2006-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/safe-read.c b/gnu/safe-read.c index 4170f7e..efc7467 100644 --- a/gnu/safe-read.c +++ b/gnu/safe-read.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* An interface to read and write that retries after interrupts. - Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2013 Free Software + Copyright (C) 1993-1994, 1998, 2002-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/safe-read.h b/gnu/safe-read.h index 227105f..1113949 100644 --- a/gnu/safe-read.h +++ b/gnu/safe-read.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* An interface to read() that retries after interrupts. - Copyright (C) 2002, 2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2002, 2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/safe-write.c b/gnu/safe-write.c index 0e39b08..c5cc209 100644 --- a/gnu/safe-write.c +++ b/gnu/safe-write.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* An interface to write that retries after interrupts. - Copyright (C) 2002, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2002, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/safe-write.h b/gnu/safe-write.h index cf7b250..8fcea32 100644 --- a/gnu/safe-write.h +++ b/gnu/safe-write.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* An interface to write() that retries after interrupts. - Copyright (C) 2002, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2002, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/same-inode.h b/gnu/same-inode.h index 743affc..25cb2ca 100644 --- a/gnu/same-inode.h +++ b/gnu/same-inode.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Determine whether two stat buffers refer to the same file. - Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/save-cwd.c b/gnu/save-cwd.c index dccea7e..b5a028b 100644 --- a/gnu/save-cwd.c +++ b/gnu/save-cwd.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* save-cwd.c -- Save and restore current working directory. - Copyright (C) 1995, 1997-1998, 2003-2006, 2009-2013 Free Software + Copyright (C) 1995, 1997-1998, 2003-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/save-cwd.h b/gnu/save-cwd.h index 65c803c..5d8e4fa 100644 --- a/gnu/save-cwd.h +++ b/gnu/save-cwd.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Save and restore current working directory. - Copyright (C) 1995, 1997-1998, 2003, 2009-2013 Free Software Foundation, + Copyright (C) 1995, 1997-1998, 2003, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/savedir.c b/gnu/savedir.c index 25bf808..8657bfd 100644 --- a/gnu/savedir.c +++ b/gnu/savedir.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* savedir.c -- save the list of files in a directory in a string - Copyright (C) 1990, 1997-2001, 2003-2006, 2009-2013 Free Software + Copyright (C) 1990, 1997-2001, 2003-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -39,29 +39,71 @@ #include "xalloc.h" -#ifndef NAME_SIZE_DEFAULT -# define NAME_SIZE_DEFAULT 512 +typedef struct +{ + char *name; +#if D_INO_IN_DIRENT + ino_t ino; +#endif +} direntry_t; + +/* Compare the names of two directory entries */ + +static int +direntry_cmp_name (void const *a, void const *b) +{ + direntry_t const *dea = a; + direntry_t const *deb = b; + + return strcmp (dea->name, deb->name); +} + +#if D_INO_IN_DIRENT +/* Compare the inode numbers of two directory entries */ + +static int +direntry_cmp_inode (void const *a, void const *b) +{ + direntry_t const *dea = a; + direntry_t const *deb = b; + + return dea->ino < deb->ino ? -1 : dea->ino > deb->ino; +} #endif +typedef int (*comparison_function) (void const *, void const *); + +static comparison_function const comparison_function_table[] = + { + 0, + direntry_cmp_name +#if D_INO_IN_DIRENT + , direntry_cmp_inode +#endif + }; + /* Return a freshly allocated string containing the file names in directory DIRP, separated by '\0' characters; the end is marked by two '\0' characters in a row. + Returned values are sorted according to OPTION. Return NULL (setting errno) if DIRP cannot be read. If DIRP is NULL, return NULL without affecting errno. */ char * -streamsavedir (DIR *dirp) +streamsavedir (DIR *dirp, enum savedir_option option) { - char *name_space; - size_t allocated = NAME_SIZE_DEFAULT; + char *name_space = NULL; + size_t allocated = 0; + direntry_t *entries = NULL; + size_t entries_allocated = 0; + size_t entries_used = 0; size_t used = 0; - int save_errno; + int readdir_errno; + comparison_function cmp = comparison_function_table[option]; if (dirp == NULL) return NULL; - name_space = xmalloc (allocated); - for (;;) { struct dirent const *dp; @@ -78,48 +120,64 @@ streamsavedir (DIR *dirp) if (entry[entry[0] != '.' ? 0 : entry[1] != '.' ? 1 : 2] != '\0') { size_t entry_size = _D_EXACT_NAMLEN (dp) + 1; - if (used + entry_size < used) - xalloc_die (); - if (allocated <= used + entry_size) + if (cmp) + { + if (entries_allocated == entries_used) + { + size_t n = entries_allocated; + entries = x2nrealloc (entries, &n, sizeof *entries); + entries_allocated = n; + } + entries[entries_used].name = xstrdup (entry); +#if D_INO_IN_DIRENT + entries[entries_used].ino = dp->d_ino; +#endif + entries_used++; + } + else { - do + if (allocated - used <= entry_size) { - if (2 * allocated < allocated) + size_t n = used + entry_size; + if (n < used) xalloc_die (); - allocated *= 2; + name_space = x2nrealloc (name_space, &n, 1); + allocated = n; } - while (allocated <= used + entry_size); - - name_space = xrealloc (name_space, allocated); + memcpy (name_space + used, entry, entry_size); } - memcpy (name_space + used, entry, entry_size); used += entry_size; } } - name_space[used] = '\0'; - save_errno = errno; - if (save_errno != 0) + + readdir_errno = errno; + if (readdir_errno != 0) { + free (entries); free (name_space); - errno = save_errno; + errno = readdir_errno; return NULL; } - return name_space; -} - -/* Like streamsavedir (DIRP), except also close DIRP. */ -static char * -savedirstream (DIR *dirp) -{ - char *name_space = streamsavedir (dirp); - if (dirp && closedir (dirp) != 0) + if (cmp) { - int save_errno = errno; - free (name_space); - errno = save_errno; - return NULL; + size_t i; + + qsort (entries, entries_used, sizeof *entries, cmp); + name_space = xmalloc (used + 1); + used = 0; + for (i = 0; i < entries_used; i++) + { + char *dest = name_space + used; + used += stpcpy (dest, entries[i].name) - dest + 1; + free (entries[i].name); + } + free (entries); } + else if (used == allocated) + name_space = xrealloc (name_space, used + 1); + + name_space[used] = '\0'; return name_space; } @@ -129,19 +187,21 @@ savedirstream (DIR *dirp) Return NULL (setting errno) if DIR cannot be opened, read, or closed. */ char * -savedir (char const *dir) +savedir (char const *dir, enum savedir_option option) { - return savedirstream (opendir (dir)); -} - -/* Return a freshly allocated string containing the file names - in directory FD, separated by '\0' characters; - the end is marked by two '\0' characters in a row. - Return NULL (setting errno) if FD cannot be read or closed. */ - -/* deprecated */ -char * -fdsavedir (int fd) -{ - return savedirstream (fdopendir (fd)); + DIR *dirp = opendir (dir); + if (! dirp) + return NULL; + else + { + char *name_space = streamsavedir (dirp, option); + if (closedir (dirp) != 0) + { + int closedir_errno = errno; + free (name_space); + errno = closedir_errno; + return NULL; + } + return name_space; + } } diff --git a/gnu/savedir.h b/gnu/savedir.h index e7d2336..5b53e65 100644 --- a/gnu/savedir.h +++ b/gnu/savedir.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Save the list of files in a directory in a string. - Copyright (C) 1997, 1999, 2001, 2003, 2005, 2009-2013 Free Software + Copyright (C) 1997, 1999, 2001, 2003, 2005, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -24,8 +24,20 @@ #define _GL_SAVEDIR_H #include -char *streamsavedir (DIR *dirp); -char *savedir (char const *dir); -char *fdsavedir (int fd); /* deprecated */ + +enum savedir_option + { + SAVEDIR_SORT_NONE, + SAVEDIR_SORT_NAME, +#if D_INO_IN_DIRENT + SAVEDIR_SORT_INODE, + SAVEDIR_SORT_FASTREAD = SAVEDIR_SORT_INODE +#else + SAVEDIR_SORT_FASTREAD = SAVEDIR_SORT_NONE +#endif + }; + +char *streamsavedir (DIR *, enum savedir_option); +char *savedir (char const *, enum savedir_option); #endif diff --git a/gnu/se-context.in.h b/gnu/se-context.in.h index f2b2cc0..ebe7277 100644 --- a/gnu/se-context.in.h +++ b/gnu/se-context.in.h @@ -5,6 +5,9 @@ # include +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif _GL_INLINE_HEADER_BEGIN #ifndef SE_CONTEXT_INLINE # define SE_CONTEXT_INLINE _GL_INLINE @@ -31,6 +34,14 @@ SE_CONTEXT_INLINE int context_range_set (context_t sc _GL_UNUSED_PARAMETER, SE_CONTEXT_INLINE int context_type_set (context_t sc _GL_UNUSED_PARAMETER, char const *s _GL_UNUSED_PARAMETER) { errno = ENOTSUP; return -1; } +SE_CONTEXT_INLINE char *context_type_get (context_t sc _GL_UNUSED_PARAMETER) + { errno = ENOTSUP; return (void *) 0; } +SE_CONTEXT_INLINE char *context_range_get (context_t sc _GL_UNUSED_PARAMETER) + { errno = ENOTSUP; return (void *) 0; } +SE_CONTEXT_INLINE char *context_role_get (context_t sc _GL_UNUSED_PARAMETER) + { errno = ENOTSUP; return (void *) 0; } +SE_CONTEXT_INLINE char *context_user_get (context_t sc _GL_UNUSED_PARAMETER) + { errno = ENOTSUP; return (void *) 0; } _GL_INLINE_HEADER_END diff --git a/gnu/se-selinux.in.h b/gnu/se-selinux.in.h index 7af2c14..e798e1e 100644 --- a/gnu/se-selinux.in.h +++ b/gnu/se-selinux.in.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Replacement for platforms that lack it. - Copyright (C) 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2008-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -33,6 +33,9 @@ # include # include +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif _GL_INLINE_HEADER_BEGIN # ifndef SE_SELINUX_INLINE # define SE_SELINUX_INLINE _GL_INLINE @@ -43,7 +46,7 @@ _GL_INLINE_HEADER_BEGIN # if !GNULIB_defined_security_types typedef unsigned short security_class_t; -# define security_context_t char* +typedef char *security_context_t; # define is_selinux_enabled() 0 SE_SELINUX_INLINE int @@ -102,6 +105,9 @@ security_compute_create (security_context_t scon _GL_UNUSED_PARAMETER, security_class_t tclass _GL_UNUSED_PARAMETER, security_context_t *newcon _GL_UNUSED_PARAMETER) { errno = ENOTSUP; return -1; } +SE_SELINUX_INLINE security_class_t +string_to_security_class (char const *name) + { errno = ENOTSUP; return 0; } SE_SELINUX_INLINE int matchpathcon_init_prefix (char const *path _GL_UNUSED_PARAMETER, char const *prefix _GL_UNUSED_PARAMETER) @@ -110,6 +116,9 @@ matchpathcon_init_prefix (char const *path _GL_UNUSED_PARAMETER, # define GNULIB_defined_security_types 1 # endif +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif _GL_INLINE_HEADER_BEGIN # endif diff --git a/gnu/secure_getenv.c b/gnu/secure_getenv.c index ce31415..b8920c1 100644 --- a/gnu/secure_getenv.c +++ b/gnu/secure_getenv.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Look up an environment variable more securely. - Copyright 2013 Free Software Foundation, Inc. + Copyright 2013-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/gnu/selinux-at.c b/gnu/selinux-at.c index 34471fa..da998cd 100644 --- a/gnu/selinux-at.c +++ b/gnu/selinux-at.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* openat-style fd-relative functions for SE Linux - Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,7 +28,6 @@ #include #include -#include "dirname.h" /* solely for definition of IS_ABSOLUTE_FILE_NAME */ #include "save-cwd.h" #include "openat-priv.h" diff --git a/gnu/selinux-at.h b/gnu/selinux-at.h index cadd155..1808e35 100644 --- a/gnu/selinux-at.h +++ b/gnu/selinux-at.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Prototypes for openat-style fd-relative SELinux functions - Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/set-acl.c b/gnu/set-acl.c index 371e0df..aceffbd 100644 --- a/gnu/set-acl.c +++ b/gnu/set-acl.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* set-acl.c - set access control list equivalent to a mode - Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc. + Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/setenv.c b/gnu/setenv.c index 59f00bc..bb458d6 100644 --- a/gnu/setenv.c +++ b/gnu/setenv.c @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 1992, 1995-2003, 2005-2013 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1995-2003, 2005-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify diff --git a/gnu/signal.in.h b/gnu/signal.in.h index 87f7471..98c6567 100644 --- a/gnu/signal.in.h +++ b/gnu/signal.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A GNU-like . - Copyright (C) 2006-2013 Free Software Foundation, Inc. + Copyright (C) 2006-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -197,6 +197,20 @@ typedef int verify_NSIG_constraint[NSIG <= 32 ? 1 : -1]; # endif +/* When also using extern inline, suppress the use of static inline in + standard headers of problematic Apple configurations, as Libc at + least through Libc-825.26 (2013-04-09) mishandles it; see, e.g., + . + Perhaps Apple will fix this some day. */ +#if (defined _GL_EXTERN_INLINE_IN_USE && defined __APPLE__ \ + && (defined __i386__ || defined __x86_64__)) +# undef sigaddset +# undef sigdelset +# undef sigemptyset +# undef sigfillset +# undef sigismember +#endif + /* Test whether a given signal is contained in a signal set. */ # if @HAVE_POSIX_SIGNALBLOCKING@ /* This function is defined as a macro on Mac OS X. */ diff --git a/gnu/size_max.h b/gnu/size_max.h index ba79e9a..a773408 100644 --- a/gnu/size_max.h +++ b/gnu/size_max.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* size_max.h -- declare SIZE_MAX through system headers - Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc. Written by Simon Josefsson. This program is free software; you can redistribute it and/or modify diff --git a/gnu/sleep.c b/gnu/sleep.c index 51f2d54..32b151f 100644 --- a/gnu/sleep.c +++ b/gnu/sleep.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Pausing execution of the current thread. - Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2007. This program is free software: you can redistribute it and/or modify diff --git a/gnu/snprintf.c b/gnu/snprintf.c index db7904a..28713ad 100644 --- a/gnu/snprintf.c +++ b/gnu/snprintf.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Formatted output to strings. - Copyright (C) 2004, 2006-2013 Free Software Foundation, Inc. + Copyright (C) 2004, 2006-2014 Free Software Foundation, Inc. Written by Simon Josefsson and Paul Eggert. This program is free software; you can redistribute it and/or modify diff --git a/gnu/stat-time.h b/gnu/stat-time.h index 5aa6621..8f18fd7 100644 --- a/gnu/stat-time.h +++ b/gnu/stat-time.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* stat-related time functions. - Copyright (C) 2005, 2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,6 +25,9 @@ #include #include +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif _GL_INLINE_HEADER_BEGIN #ifndef _GL_STAT_TIME_INLINE # define _GL_STAT_TIME_INLINE _GL_INLINE diff --git a/gnu/stat.c b/gnu/stat.c index 128a9bf..c5a3696 100644 --- a/gnu/stat.c +++ b/gnu/stat.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Work around platform bugs in stat. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/stdalign.in.h b/gnu/stdalign.in.h index 7256ede..6f1f4d5 100644 --- a/gnu/stdalign.in.h +++ b/gnu/stdalign.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A substitute for ISO C11 . - Copyright 2011-2013 Free Software Foundation, Inc. + Copyright 2011-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -43,13 +43,28 @@ are 4 unless the option '-malign-double' is used. The result cannot be used as a value for an 'enum' constant, if you - want to be portable to HP-UX 10.20 cc and AIX 3.2.5 xlc. */ + want to be portable to HP-UX 10.20 cc and AIX 3.2.5 xlc. + + Include for offsetof. */ #include -#if defined __cplusplus + +/* FreeBSD 9.1 , included by and lots of other + standard headers, defines conflicting implementations of _Alignas + and _Alignof that are no better than ours; override them. */ +#undef _Alignas +#undef _Alignof + +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 +# ifdef __cplusplus +# if 201103 <= __cplusplus +# define _Alignof(type) alignof (type) +# else template struct __alignof_helper { char __a; __t __b; }; -# define _Alignof(type) offsetof (__alignof_helper, __b) -#else -# define _Alignof(type) offsetof (struct { char __a; type __b; }, __b) +# define _Alignof(type) offsetof (__alignof_helper, __b) +# endif +# else +# define _Alignof(type) offsetof (struct { char __a; type __b; }, __b) +# endif #endif #define alignof _Alignof #define __alignof_is_defined 1 @@ -79,12 +94,17 @@ */ -#if __GNUC__ || __IBMC__ || __IBMCPP__ || 0x5110 <= __SUNPRO_C -# define _Alignas(a) __attribute__ ((__aligned__ (a))) -#elif 1300 <= _MSC_VER -# define _Alignas(a) __declspec (align (a)) +#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112 +# if defined __cplusplus && 201103 <= __cplusplus +# define _Alignas(a) alignas (a) +# elif (__GNUC__ || __HP_cc || __HP_aCC || __IBMC__ || __IBMCPP__ \ + || __ICC || 0x5110 <= __SUNPRO_C) +# define _Alignas(a) __attribute__ ((__aligned__ (a))) +# elif 1300 <= _MSC_VER +# define _Alignas(a) __declspec (align (a)) +# endif #endif -#ifdef _Alignas +#if defined _Alignas || (defined __STDC_VERSION && 201112 <= __STDC_VERSION__) # define alignas _Alignas # define __alignas_is_defined 1 #endif diff --git a/gnu/stdarg.in.h b/gnu/stdarg.in.h index e242839..a165987 100644 --- a/gnu/stdarg.in.h +++ b/gnu/stdarg.in.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Substitute for and wrapper around . - Copyright (C) 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2008-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/stdbool.in.h b/gnu/stdbool.in.h index d895801..2f418ca 100644 --- a/gnu/stdbool.in.h +++ b/gnu/stdbool.in.h @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 2001-2003, 2006-2013 Free Software Foundation, Inc. +/* Copyright (C) 2001-2003, 2006-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2001. This program is free software; you can redistribute it and/or modify diff --git a/gnu/stddef.in.h b/gnu/stddef.in.h index 9706a9c..597ae3e 100644 --- a/gnu/stddef.in.h +++ b/gnu/stddef.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A substitute for POSIX 2008 , for platforms that have issues. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/stdint.in.h b/gnu/stdint.in.h index 6604936..5d30b76 100644 --- a/gnu/stdint.in.h +++ b/gnu/stdint.in.h @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 2001-2002, 2004-2013 Free Software Foundation, Inc. +/* Copyright (C) 2001-2002, 2004-2014 Free Software Foundation, Inc. Written by Paul Eggert, Bruno Haible, Sam Steingold, Peter Burwood. This file is part of gnulib. @@ -40,8 +40,7 @@ other system header files; just include the system's . Ideally we should test __BIONIC__ here, but it is only defined after has been included; hence test __ANDROID__ instead. */ -#if defined __ANDROID__ \ - && defined _SYS_TYPES_H_ && !defined __need_size_t +#if defined __ANDROID__ && defined _GL_INCLUDING_SYS_TYPES_H # @INCLUDE_NEXT@ @NEXT_STDINT_H@ #else diff --git a/gnu/stdio-impl.h b/gnu/stdio-impl.h index fd916d8..b65f6fd 100644 --- a/gnu/stdio-impl.h +++ b/gnu/stdio-impl.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Implementation details of FILE streams. - Copyright (C) 2007-2008, 2010-2013 Free Software Foundation, Inc. + Copyright (C) 2007-2008, 2010-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -59,7 +59,7 @@ # define fp_ fp # endif -# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ /* NetBSD >= 1.5ZA, OpenBSD */ +# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __ANDROID__ /* NetBSD >= 1.5ZA, OpenBSD, Android */ /* See and */ struct __sfileext diff --git a/gnu/stdio.in.h b/gnu/stdio.in.h index 6179004..f715bdf 100644 --- a/gnu/stdio.in.h +++ b/gnu/stdio.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A GNU-like . - Copyright (C) 2004, 2007-2013 Free Software Foundation, Inc. + Copyright (C) 2004, 2007-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -126,6 +126,15 @@ #define _GL_STDIO_STRINGIZE(token) #token #define _GL_STDIO_MACROEXPAND_AND_STRINGIZE(token) _GL_STDIO_STRINGIZE(token) +/* When also using extern inline, suppress the use of static inline in + standard headers of problematic Apple configurations, as Libc at + least through Libc-825.26 (2013-04-09) mishandles it; see, e.g., + . + Perhaps Apple will fix this some day. */ +#if (defined _GL_EXTERN_INLINE_IN_USE && defined __APPLE__ \ + && defined __GNUC__ && defined __STDC__) +# undef putc_unlocked +#endif #if @GNULIB_DPRINTF@ # if @REPLACE_DPRINTF@ diff --git a/gnu/stdlib.in.h b/gnu/stdlib.in.h index 863457f..7f64d2f 100644 --- a/gnu/stdlib.in.h +++ b/gnu/stdlib.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A GNU-like . - Copyright (C) 1995, 2001-2004, 2006-2013 Free Software Foundation, Inc. + Copyright (C) 1995, 2001-2004, 2006-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/stpcpy.c b/gnu/stpcpy.c index 68db675..8013fb0 100644 --- a/gnu/stpcpy.c +++ b/gnu/stpcpy.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* stpcpy.c -- copy a string and return pointer to end of new string - Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2013 Free Software + Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2014 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. diff --git a/gnu/strcasecmp.c b/gnu/strcasecmp.c index 8c480a8..dee5d38 100644 --- a/gnu/strcasecmp.c +++ b/gnu/strcasecmp.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Case-insensitive string comparison function. - Copyright (C) 1998-1999, 2005-2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2007, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/strchrnul.c b/gnu/strchrnul.c index f054acd..7ea2fca 100644 --- a/gnu/strchrnul.c +++ b/gnu/strchrnul.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Searching in a string. - Copyright (C) 2003, 2007-2013 Free Software Foundation, Inc. + Copyright (C) 2003, 2007-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/strdup.c b/gnu/strdup.c index 8ebc71f..614fe84 100644 --- a/gnu/strdup.c +++ b/gnu/strdup.c @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2013 Free Software +/* Copyright (C) 1991, 1996-1998, 2002-2004, 2006-2007, 2009-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. diff --git a/gnu/streq.h b/gnu/streq.h index 89533c5..e7ee9fc 100644 --- a/gnu/streq.h +++ b/gnu/streq.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Optimized string comparison. - Copyright (C) 2001-2002, 2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/gnu/strerror-override.c b/gnu/strerror-override.c index 4e017bc..5f129b8 100644 --- a/gnu/strerror-override.c +++ b/gnu/strerror-override.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* strerror-override.c --- POSIX compatible system error routine - Copyright (C) 2010-2013 Free Software Foundation, Inc. + Copyright (C) 2010-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/strerror-override.h b/gnu/strerror-override.h index e610dd6..f65c0b9 100644 --- a/gnu/strerror-override.h +++ b/gnu/strerror-override.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* strerror-override.h --- POSIX compatible system error routine - Copyright (C) 2010-2013 Free Software Foundation, Inc. + Copyright (C) 2010-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ || GNULIB_defined_EOWNERDEAD \ || GNULIB_defined_ENOTRECOVERABLE \ || GNULIB_defined_EILSEQ -extern const char *strerror_override (int errnum); +extern const char *strerror_override (int errnum) _GL_ATTRIBUTE_CONST; # else # define strerror_override(ignored) NULL # endif diff --git a/gnu/strerror.c b/gnu/strerror.c index 42b6f81..612b79c 100644 --- a/gnu/strerror.c +++ b/gnu/strerror.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* strerror.c --- POSIX compatible system error routine - Copyright (C) 2007-2013 Free Software Foundation, Inc. + Copyright (C) 2007-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/strftime.c b/gnu/strftime.c new file mode 100644 index 0000000..f451611 --- /dev/null +++ b/gnu/strftime.c @@ -0,0 +1,1489 @@ +/* -*- buffer-read-only: t -*- vi: set ro: */ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* Copyright (C) 1991-2001, 2003-2007, 2009-2014 Free Software Foundation, Inc. + + NOTE: The canonical source of this file is maintained with the GNU C Library. + Bugs can be reported to bug-glibc@prep.ai.mit.edu. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifdef _LIBC +# define HAVE_STRUCT_ERA_ENTRY 1 +# define HAVE_TM_GMTOFF 1 +# define HAVE_TM_ZONE 1 +# define HAVE_TZNAME 1 +# define HAVE_TZSET 1 +# include "../locale/localeinfo.h" +#else +# include +# if FPRINTFTIME +# include "fprintftime.h" +# else +# include "strftime.h" +# endif +#endif + +#include +#include + +#if HAVE_TZNAME && !HAVE_DECL_TZNAME +extern char *tzname[]; +#endif + +/* Do multibyte processing if multibyte encodings are supported, unless + multibyte sequences are safe in formats. Multibyte sequences are + safe if they cannot contain byte sequences that look like format + conversion specifications. The multibyte encodings used by the + C library on the various platforms (UTF-8, GB2312, GBK, CP936, + GB18030, EUC-TW, BIG5, BIG5-HKSCS, CP950, EUC-JP, EUC-KR, CP949, + SHIFT_JIS, CP932, JOHAB) are safe for formats, because the byte '%' + cannot occur in a multibyte character except in the first byte. + + The DEC-HANYU encoding used on OSF/1 is not safe for formats, but + this encoding has never been seen in real-life use, so we ignore + it. */ +#if !(defined __osf__ && 0) +# define MULTIBYTE_IS_FORMAT_SAFE 1 +#endif +#define DO_MULTIBYTE (! MULTIBYTE_IS_FORMAT_SAFE) + +#if DO_MULTIBYTE +# include + static const mbstate_t mbstate_zero; +#endif + +#include +#include +#include +#include +#include + +#ifdef COMPILE_WIDE +# include +# define CHAR_T wchar_t +# define UCHAR_T unsigned int +# define L_(Str) L##Str +# define NLW(Sym) _NL_W##Sym + +# define MEMCPY(d, s, n) __wmemcpy (d, s, n) +# define STRLEN(s) __wcslen (s) + +#else +# define CHAR_T char +# define UCHAR_T unsigned char +# define L_(Str) Str +# define NLW(Sym) Sym + +# define MEMCPY(d, s, n) memcpy (d, s, n) +# define STRLEN(s) strlen (s) + +#endif + +/* Shift A right by B bits portably, by dividing A by 2**B and + truncating towards minus infinity. A and B should be free of side + effects, and B should be in the range 0 <= B <= INT_BITS - 2, where + INT_BITS is the number of useful bits in an int. GNU code can + assume that INT_BITS is at least 32. + + ISO C99 says that A >> B is implementation-defined if A < 0. Some + implementations (e.g., UNICOS 9.0 on a Cray Y-MP EL) don't shift + right in the usual way when A < 0, so SHR falls back on division if + ordinary A >> B doesn't seem to be the usual signed shift. */ +#define SHR(a, b) \ + (-1 >> 1 == -1 \ + ? (a) >> (b) \ + : (a) / (1 << (b)) - ((a) % (1 << (b)) < 0)) + +/* Bound on length of the string representing an integer type or expression T. + Subtract 1 for the sign bit if t is signed; log10 (2.0) < 146/485; + add 1 for integer division truncation; add 1 more for a minus sign + if needed. */ +#define INT_STRLEN_BOUND(t) \ + ((sizeof (t) * CHAR_BIT - 1) * 146 / 485 + 2) + +#define TM_YEAR_BASE 1900 + +#ifndef __isleap +/* Nonzero if YEAR is a leap year (every 4 years, + except every 100th isn't, and every 400th is). */ +# define __isleap(year) \ + ((year) % 4 == 0 && ((year) % 100 != 0 || (year) % 400 == 0)) +#endif + + +#ifdef _LIBC +# define tzname __tzname +# define tzset __tzset +#endif + +#if !HAVE_TM_GMTOFF +/* Portable standalone applications should supply a "time.h" that + declares a POSIX-compliant localtime_r, for the benefit of older + implementations that lack localtime_r or have a nonstandard one. + See the gnulib time_r module for one way to implement this. */ +# undef __gmtime_r +# undef __localtime_r +# define __gmtime_r gmtime_r +# define __localtime_r localtime_r +#endif + + +#ifndef FPRINTFTIME +# define FPRINTFTIME 0 +#endif + +#if FPRINTFTIME +# define STREAM_OR_CHAR_T FILE +# define STRFTIME_ARG(x) /* empty */ +#else +# define STREAM_OR_CHAR_T CHAR_T +# define STRFTIME_ARG(x) x, +#endif + +#if FPRINTFTIME +# define memset_byte(P, Len, Byte) \ + do { size_t _i; for (_i = 0; _i < Len; _i++) fputc (Byte, P); } while (0) +# define memset_space(P, Len) memset_byte (P, Len, ' ') +# define memset_zero(P, Len) memset_byte (P, Len, '0') +#elif defined COMPILE_WIDE +# define memset_space(P, Len) (wmemset (P, L' ', Len), (P) += (Len)) +# define memset_zero(P, Len) (wmemset (P, L'0', Len), (P) += (Len)) +#else +# define memset_space(P, Len) (memset (P, ' ', Len), (P) += (Len)) +# define memset_zero(P, Len) (memset (P, '0', Len), (P) += (Len)) +#endif + +#if FPRINTFTIME +# define advance(P, N) +#else +# define advance(P, N) ((P) += (N)) +#endif + +#define add(n, f) \ + do \ + { \ + size_t _n = (n); \ + size_t _w = (width < 0 ? 0 : width); \ + size_t _incr = _n < _w ? _w : _n; \ + if (_incr >= maxsize - i) \ + return 0; \ + if (p) \ + { \ + if (digits == 0 && _n < _w) \ + { \ + size_t _delta = width - _n; \ + if (pad == L_('0')) \ + memset_zero (p, _delta); \ + else \ + memset_space (p, _delta); \ + } \ + f; \ + advance (p, _n); \ + } \ + i += _incr; \ + } while (0) + +#if FPRINTFTIME +# define add1(C) add (1, fputc (C, p)) +#else +# define add1(C) add (1, *p = C) +#endif + +#if FPRINTFTIME +# define cpy(n, s) \ + add ((n), \ + do \ + { \ + if (to_lowcase) \ + fwrite_lowcase (p, (s), _n); \ + else if (to_uppcase) \ + fwrite_uppcase (p, (s), _n); \ + else \ + { \ + /* Ignore the value of fwrite. The caller can determine whether \ + an error occurred by inspecting ferror (P). All known fwrite \ + implementations set the stream's error indicator when they \ + fail due to ENOMEM etc., even though C11 and POSIX.1-2008 do \ + not require this. */ \ + fwrite (s, _n, 1, p); \ + } \ + } \ + while (0) \ + ) +#else +# define cpy(n, s) \ + add ((n), \ + if (to_lowcase) \ + memcpy_lowcase (p, (s), _n LOCALE_ARG); \ + else if (to_uppcase) \ + memcpy_uppcase (p, (s), _n LOCALE_ARG); \ + else \ + MEMCPY ((void *) p, (void const *) (s), _n)) +#endif + +#ifdef COMPILE_WIDE +# ifndef USE_IN_EXTENDED_LOCALE_MODEL +# undef __mbsrtowcs_l +# define __mbsrtowcs_l(d, s, l, st, loc) __mbsrtowcs (d, s, l, st) +# endif +# define widen(os, ws, l) \ + { \ + mbstate_t __st; \ + const char *__s = os; \ + memset (&__st, '\0', sizeof (__st)); \ + l = __mbsrtowcs_l (NULL, &__s, 0, &__st, loc); \ + ws = (wchar_t *) alloca ((l + 1) * sizeof (wchar_t)); \ + (void) __mbsrtowcs_l (ws, &__s, l, &__st, loc); \ + } +#endif + + +#if defined _LIBC && defined USE_IN_EXTENDED_LOCALE_MODEL +/* We use this code also for the extended locale handling where the + function gets as an additional argument the locale which has to be + used. To access the values we have to redefine the _NL_CURRENT + macro. */ +# define strftime __strftime_l +# define wcsftime __wcsftime_l +# undef _NL_CURRENT +# define _NL_CURRENT(category, item) \ + (current->values[_NL_ITEM_INDEX (item)].string) +# define LOCALE_ARG , loc +# define LOCALE_PARAM_PROTO , __locale_t loc +# define HELPER_LOCALE_ARG , current +#else +# define LOCALE_PARAM_PROTO +# define LOCALE_ARG +# ifdef _LIBC +# define HELPER_LOCALE_ARG , _NL_CURRENT_DATA (LC_TIME) +# else +# define HELPER_LOCALE_ARG +# endif +#endif + +#ifdef COMPILE_WIDE +# ifdef USE_IN_EXTENDED_LOCALE_MODEL +# define TOUPPER(Ch, L) __towupper_l (Ch, L) +# define TOLOWER(Ch, L) __towlower_l (Ch, L) +# else +# define TOUPPER(Ch, L) towupper (Ch) +# define TOLOWER(Ch, L) towlower (Ch) +# endif +#else +# ifdef USE_IN_EXTENDED_LOCALE_MODEL +# define TOUPPER(Ch, L) __toupper_l (Ch, L) +# define TOLOWER(Ch, L) __tolower_l (Ch, L) +# else +# define TOUPPER(Ch, L) toupper (Ch) +# define TOLOWER(Ch, L) tolower (Ch) +# endif +#endif +/* We don't use 'isdigit' here since the locale dependent + interpretation is not what we want here. We only need to accept + the arabic digits in the ASCII range. One day there is perhaps a + more reliable way to accept other sets of digits. */ +#define ISDIGIT(Ch) ((unsigned int) (Ch) - L_('0') <= 9) + +#if FPRINTFTIME +static void +fwrite_lowcase (FILE *fp, const CHAR_T *src, size_t len) +{ + while (len-- > 0) + { + fputc (TOLOWER ((UCHAR_T) *src, loc), fp); + ++src; + } +} + +static void +fwrite_uppcase (FILE *fp, const CHAR_T *src, size_t len) +{ + while (len-- > 0) + { + fputc (TOUPPER ((UCHAR_T) *src, loc), fp); + ++src; + } +} +#else +static CHAR_T * +memcpy_lowcase (CHAR_T *dest, const CHAR_T *src, + size_t len LOCALE_PARAM_PROTO) +{ + while (len-- > 0) + dest[len] = TOLOWER ((UCHAR_T) src[len], loc); + return dest; +} + +static CHAR_T * +memcpy_uppcase (CHAR_T *dest, const CHAR_T *src, + size_t len LOCALE_PARAM_PROTO) +{ + while (len-- > 0) + dest[len] = TOUPPER ((UCHAR_T) src[len], loc); + return dest; +} +#endif + + +#if ! HAVE_TM_GMTOFF +/* Yield the difference between *A and *B, + measured in seconds, ignoring leap seconds. */ +# define tm_diff ftime_tm_diff +static int +tm_diff (const struct tm *a, const struct tm *b) +{ + /* Compute intervening leap days correctly even if year is negative. + Take care to avoid int overflow in leap day calculations, + but it's OK to assume that A and B are close to each other. */ + int a4 = SHR (a->tm_year, 2) + SHR (TM_YEAR_BASE, 2) - ! (a->tm_year & 3); + int b4 = SHR (b->tm_year, 2) + SHR (TM_YEAR_BASE, 2) - ! (b->tm_year & 3); + int a100 = a4 / 25 - (a4 % 25 < 0); + int b100 = b4 / 25 - (b4 % 25 < 0); + int a400 = SHR (a100, 2); + int b400 = SHR (b100, 2); + int intervening_leap_days = (a4 - b4) - (a100 - b100) + (a400 - b400); + int years = a->tm_year - b->tm_year; + int days = (365 * years + intervening_leap_days + + (a->tm_yday - b->tm_yday)); + return (60 * (60 * (24 * days + (a->tm_hour - b->tm_hour)) + + (a->tm_min - b->tm_min)) + + (a->tm_sec - b->tm_sec)); +} +#endif /* ! HAVE_TM_GMTOFF */ + + + +/* The number of days from the first day of the first ISO week of this + year to the year day YDAY with week day WDAY. ISO weeks start on + Monday; the first ISO week has the year's first Thursday. YDAY may + be as small as YDAY_MINIMUM. */ +#define ISO_WEEK_START_WDAY 1 /* Monday */ +#define ISO_WEEK1_WDAY 4 /* Thursday */ +#define YDAY_MINIMUM (-366) +#ifdef __GNUC__ +__inline__ +#endif +static int +iso_week_days (int yday, int wday) +{ + /* Add enough to the first operand of % to make it nonnegative. */ + int big_enough_multiple_of_7 = (-YDAY_MINIMUM / 7 + 2) * 7; + return (yday + - (yday - wday + ISO_WEEK1_WDAY + big_enough_multiple_of_7) % 7 + + ISO_WEEK1_WDAY - ISO_WEEK_START_WDAY); +} + + +/* When compiling this file, GNU applications can #define my_strftime + to a symbol (typically nstrftime) to get an extended strftime with + extra arguments UT and NS. Emacs is a special case for now, but + this Emacs-specific code can be removed once Emacs's config.h + defines my_strftime. */ +#if defined emacs && !defined my_strftime +# define my_strftime nstrftime +#endif + +#if FPRINTFTIME +# undef my_strftime +# define my_strftime fprintftime +#endif + +#ifdef my_strftime +# define extra_args , ut, ns +# define extra_args_spec , int ut, int ns +#else +# if defined COMPILE_WIDE +# define my_strftime wcsftime +# define nl_get_alt_digit _nl_get_walt_digit +# else +# define my_strftime strftime +# define nl_get_alt_digit _nl_get_alt_digit +# endif +# define extra_args +# define extra_args_spec +/* We don't have this information in general. */ +# define ut 0 +# define ns 0 +#endif + + +/* Just like my_strftime, below, but with one more parameter, UPCASE, + to indicate that the result should be converted to upper case. */ +static size_t +strftime_case_ (bool upcase, STREAM_OR_CHAR_T *s, + STRFTIME_ARG (size_t maxsize) + const CHAR_T *format, + const struct tm *tp extra_args_spec LOCALE_PARAM_PROTO) +{ +#if defined _LIBC && defined USE_IN_EXTENDED_LOCALE_MODEL + struct locale_data *const current = loc->__locales[LC_TIME]; +#endif +#if FPRINTFTIME + size_t maxsize = (size_t) -1; +#endif + + int hour12 = tp->tm_hour; +#ifdef _NL_CURRENT + /* We cannot make the following values variables since we must delay + the evaluation of these values until really needed since some + expressions might not be valid in every situation. The 'struct tm' + might be generated by a strptime() call that initialized + only a few elements. Dereference the pointers only if the format + requires this. Then it is ok to fail if the pointers are invalid. */ +# define a_wkday \ + ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ABDAY_1) + tp->tm_wday)) +# define f_wkday \ + ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(DAY_1) + tp->tm_wday)) +# define a_month \ + ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ABMON_1) + tp->tm_mon)) +# define f_month \ + ((const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(MON_1) + tp->tm_mon)) +# define ampm \ + ((const CHAR_T *) _NL_CURRENT (LC_TIME, tp->tm_hour > 11 \ + ? NLW(PM_STR) : NLW(AM_STR))) + +# define aw_len STRLEN (a_wkday) +# define am_len STRLEN (a_month) +# define ap_len STRLEN (ampm) +#endif + const char *zone; + size_t i = 0; + STREAM_OR_CHAR_T *p = s; + const CHAR_T *f; +#if DO_MULTIBYTE && !defined COMPILE_WIDE + const char *format_end = NULL; +#endif + +#if ! defined _LIBC && ! HAVE_RUN_TZSET_TEST + /* Solaris 2.5.x and 2.6 tzset sometimes modify the storage returned + by localtime. On such systems, we must either use the tzset and + localtime wrappers to work around the bug (which sets + HAVE_RUN_TZSET_TEST) or make a copy of the structure. */ + struct tm copy = *tp; + tp = © +#endif + + zone = NULL; +#if HAVE_TM_ZONE + /* The POSIX test suite assumes that setting + the environment variable TZ to a new value before calling strftime() + will influence the result (the %Z format) even if the information in + TP is computed with a totally different time zone. + This is bogus: though POSIX allows bad behavior like this, + POSIX does not require it. Do the right thing instead. */ + zone = (const char *) tp->tm_zone; +#endif +#if HAVE_TZNAME + if (ut) + { + if (! (zone && *zone)) + zone = "GMT"; + } + else + { + /* POSIX.1 requires that local time zone information be used as + though strftime called tzset. */ +# if HAVE_TZSET + tzset (); +# endif + } +#endif + + if (hour12 > 12) + hour12 -= 12; + else + if (hour12 == 0) + hour12 = 12; + + for (f = format; *f != '\0'; ++f) + { + int pad = 0; /* Padding for number ('-', '_', or 0). */ + int modifier; /* Field modifier ('E', 'O', or 0). */ + int digits = 0; /* Max digits for numeric format. */ + int number_value; /* Numeric value to be printed. */ + unsigned int u_number_value; /* (unsigned int) number_value. */ + bool negative_number; /* The number is negative. */ + bool always_output_a_sign; /* +/- should always be output. */ + int tz_colon_mask; /* Bitmask of where ':' should appear. */ + const CHAR_T *subfmt; + CHAR_T sign_char; + CHAR_T *bufp; + CHAR_T buf[1 + + 2 /* for the two colons in a %::z or %:::z time zone */ + + (sizeof (int) < sizeof (time_t) + ? INT_STRLEN_BOUND (time_t) + : INT_STRLEN_BOUND (int))]; + int width = -1; + bool to_lowcase = false; + bool to_uppcase = upcase; + size_t colons; + bool change_case = false; + int format_char; + +#if DO_MULTIBYTE && !defined COMPILE_WIDE + switch (*f) + { + case L_('%'): + break; + + case L_('\b'): case L_('\t'): case L_('\n'): + case L_('\v'): case L_('\f'): case L_('\r'): + case L_(' '): case L_('!'): case L_('"'): case L_('#'): case L_('&'): + case L_('\''): case L_('('): case L_(')'): case L_('*'): case L_('+'): + case L_(','): case L_('-'): case L_('.'): case L_('/'): case L_('0'): + case L_('1'): case L_('2'): case L_('3'): case L_('4'): case L_('5'): + case L_('6'): case L_('7'): case L_('8'): case L_('9'): case L_(':'): + case L_(';'): case L_('<'): case L_('='): case L_('>'): case L_('?'): + case L_('A'): case L_('B'): case L_('C'): case L_('D'): case L_('E'): + case L_('F'): case L_('G'): case L_('H'): case L_('I'): case L_('J'): + case L_('K'): case L_('L'): case L_('M'): case L_('N'): case L_('O'): + case L_('P'): case L_('Q'): case L_('R'): case L_('S'): case L_('T'): + case L_('U'): case L_('V'): case L_('W'): case L_('X'): case L_('Y'): + case L_('Z'): case L_('['): case L_('\\'): case L_(']'): case L_('^'): + case L_('_'): case L_('a'): case L_('b'): case L_('c'): case L_('d'): + case L_('e'): case L_('f'): case L_('g'): case L_('h'): case L_('i'): + case L_('j'): case L_('k'): case L_('l'): case L_('m'): case L_('n'): + case L_('o'): case L_('p'): case L_('q'): case L_('r'): case L_('s'): + case L_('t'): case L_('u'): case L_('v'): case L_('w'): case L_('x'): + case L_('y'): case L_('z'): case L_('{'): case L_('|'): case L_('}'): + case L_('~'): + /* The C Standard requires these 98 characters (plus '%') to + be in the basic execution character set. None of these + characters can start a multibyte sequence, so they need + not be analyzed further. */ + add1 (*f); + continue; + + default: + /* Copy this multibyte sequence until we reach its end, find + an error, or come back to the initial shift state. */ + { + mbstate_t mbstate = mbstate_zero; + size_t len = 0; + size_t fsize; + + if (! format_end) + format_end = f + strlen (f) + 1; + fsize = format_end - f; + + do + { + size_t bytes = mbrlen (f + len, fsize - len, &mbstate); + + if (bytes == 0) + break; + + if (bytes == (size_t) -2) + { + len += strlen (f + len); + break; + } + + if (bytes == (size_t) -1) + { + len++; + break; + } + + len += bytes; + } + while (! mbsinit (&mbstate)); + + cpy (len, f); + f += len - 1; + continue; + } + } + +#else /* ! DO_MULTIBYTE */ + + /* Either multibyte encodings are not supported, they are + safe for formats, so any non-'%' byte can be copied through, + or this is the wide character version. */ + if (*f != L_('%')) + { + add1 (*f); + continue; + } + +#endif /* ! DO_MULTIBYTE */ + + /* Check for flags that can modify a format. */ + while (1) + { + switch (*++f) + { + /* This influences the number formats. */ + case L_('_'): + case L_('-'): + case L_('0'): + pad = *f; + continue; + + /* This changes textual output. */ + case L_('^'): + to_uppcase = true; + continue; + case L_('#'): + change_case = true; + continue; + + default: + break; + } + break; + } + + /* As a GNU extension we allow to specify the field width. */ + if (ISDIGIT (*f)) + { + width = 0; + do + { + if (width > INT_MAX / 10 + || (width == INT_MAX / 10 && *f - L_('0') > INT_MAX % 10)) + /* Avoid overflow. */ + width = INT_MAX; + else + { + width *= 10; + width += *f - L_('0'); + } + ++f; + } + while (ISDIGIT (*f)); + } + + /* Check for modifiers. */ + switch (*f) + { + case L_('E'): + case L_('O'): + modifier = *f++; + break; + + default: + modifier = 0; + break; + } + + /* Now do the specified format. */ + format_char = *f; + switch (format_char) + { +#define DO_NUMBER(d, v) \ + do \ + { \ + digits = d; \ + number_value = v; \ + goto do_number; \ + } \ + while (0) +#define DO_SIGNED_NUMBER(d, negative, v) \ + do \ + { \ + digits = d; \ + negative_number = negative; \ + u_number_value = v; \ + goto do_signed_number; \ + } \ + while (0) + + /* The mask is not what you might think. + When the ordinal i'th bit is set, insert a colon + before the i'th digit of the time zone representation. */ +#define DO_TZ_OFFSET(d, negative, mask, v) \ + do \ + { \ + digits = d; \ + negative_number = negative; \ + tz_colon_mask = mask; \ + u_number_value = v; \ + goto do_tz_offset; \ + } \ + while (0) +#define DO_NUMBER_SPACEPAD(d, v) \ + do \ + { \ + digits = d; \ + number_value = v; \ + goto do_number_spacepad; \ + } \ + while (0) + + case L_('%'): + if (modifier != 0) + goto bad_format; + add1 (*f); + break; + + case L_('a'): + if (modifier != 0) + goto bad_format; + if (change_case) + { + to_uppcase = true; + to_lowcase = false; + } +#ifdef _NL_CURRENT + cpy (aw_len, a_wkday); + break; +#else + goto underlying_strftime; +#endif + + case 'A': + if (modifier != 0) + goto bad_format; + if (change_case) + { + to_uppcase = true; + to_lowcase = false; + } +#ifdef _NL_CURRENT + cpy (STRLEN (f_wkday), f_wkday); + break; +#else + goto underlying_strftime; +#endif + + case L_('b'): + case L_('h'): + if (change_case) + { + to_uppcase = true; + to_lowcase = false; + } + if (modifier != 0) + goto bad_format; +#ifdef _NL_CURRENT + cpy (am_len, a_month); + break; +#else + goto underlying_strftime; +#endif + + case L_('B'): + if (modifier != 0) + goto bad_format; + if (change_case) + { + to_uppcase = true; + to_lowcase = false; + } +#ifdef _NL_CURRENT + cpy (STRLEN (f_month), f_month); + break; +#else + goto underlying_strftime; +#endif + + case L_('c'): + if (modifier == L_('O')) + goto bad_format; +#ifdef _NL_CURRENT + if (! (modifier == 'E' + && (*(subfmt = + (const CHAR_T *) _NL_CURRENT (LC_TIME, + NLW(ERA_D_T_FMT))) + != '\0'))) + subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(D_T_FMT)); +#else + goto underlying_strftime; +#endif + + subformat: + { + size_t len = strftime_case_ (to_uppcase, + NULL, STRFTIME_ARG ((size_t) -1) + subfmt, + tp extra_args LOCALE_ARG); + add (len, strftime_case_ (to_uppcase, p, + STRFTIME_ARG (maxsize - i) + subfmt, + tp extra_args LOCALE_ARG)); + } + break; + +#if !(defined _NL_CURRENT && HAVE_STRUCT_ERA_ENTRY) + underlying_strftime: + { + /* The relevant information is available only via the + underlying strftime implementation, so use that. */ + char ufmt[5]; + char *u = ufmt; + char ubuf[1024]; /* enough for any single format in practice */ + size_t len; + /* Make sure we're calling the actual underlying strftime. + In some cases, config.h contains something like + "#define strftime rpl_strftime". */ +# ifdef strftime +# undef strftime + size_t strftime (); +# endif + + /* The space helps distinguish strftime failure from empty + output. */ + *u++ = ' '; + *u++ = '%'; + if (modifier != 0) + *u++ = modifier; + *u++ = format_char; + *u = '\0'; + len = strftime (ubuf, sizeof ubuf, ufmt, tp); + if (len != 0) + cpy (len - 1, ubuf + 1); + } + break; +#endif + + case L_('C'): + if (modifier == L_('O')) + goto bad_format; + if (modifier == L_('E')) + { +#if HAVE_STRUCT_ERA_ENTRY + struct era_entry *era = _nl_get_era_entry (tp HELPER_LOCALE_ARG); + if (era) + { +# ifdef COMPILE_WIDE + size_t len = __wcslen (era->era_wname); + cpy (len, era->era_wname); +# else + size_t len = strlen (era->era_name); + cpy (len, era->era_name); +# endif + break; + } +#else + goto underlying_strftime; +#endif + } + + { + int century = tp->tm_year / 100 + TM_YEAR_BASE / 100; + century -= tp->tm_year % 100 < 0 && 0 < century; + DO_SIGNED_NUMBER (2, tp->tm_year < - TM_YEAR_BASE, century); + } + + case L_('x'): + if (modifier == L_('O')) + goto bad_format; +#ifdef _NL_CURRENT + if (! (modifier == L_('E') + && (*(subfmt = + (const CHAR_T *)_NL_CURRENT (LC_TIME, NLW(ERA_D_FMT))) + != L_('\0')))) + subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(D_FMT)); + goto subformat; +#else + goto underlying_strftime; +#endif + case L_('D'): + if (modifier != 0) + goto bad_format; + subfmt = L_("%m/%d/%y"); + goto subformat; + + case L_('d'): + if (modifier == L_('E')) + goto bad_format; + + DO_NUMBER (2, tp->tm_mday); + + case L_('e'): + if (modifier == L_('E')) + goto bad_format; + + DO_NUMBER_SPACEPAD (2, tp->tm_mday); + + /* All numeric formats set DIGITS and NUMBER_VALUE (or U_NUMBER_VALUE) + and then jump to one of these labels. */ + + do_tz_offset: + always_output_a_sign = true; + goto do_number_body; + + do_number_spacepad: + /* Force '_' flag unless overridden by '0' or '-' flag. */ + if (pad != L_('0') && pad != L_('-')) + pad = L_('_'); + + do_number: + /* Format NUMBER_VALUE according to the MODIFIER flag. */ + negative_number = number_value < 0; + u_number_value = number_value; + + do_signed_number: + always_output_a_sign = false; + tz_colon_mask = 0; + + do_number_body: + /* Format U_NUMBER_VALUE according to the MODIFIER flag. + NEGATIVE_NUMBER is nonzero if the original number was + negative; in this case it was converted directly to + unsigned int (i.e., modulo (UINT_MAX + 1)) without + negating it. */ + if (modifier == L_('O') && !negative_number) + { +#ifdef _NL_CURRENT + /* Get the locale specific alternate representation of + the number. If none exist NULL is returned. */ + const CHAR_T *cp = nl_get_alt_digit (u_number_value + HELPER_LOCALE_ARG); + + if (cp != NULL) + { + size_t digitlen = STRLEN (cp); + if (digitlen != 0) + { + cpy (digitlen, cp); + break; + } + } +#else + goto underlying_strftime; +#endif + } + + bufp = buf + sizeof (buf) / sizeof (buf[0]); + + if (negative_number) + u_number_value = - u_number_value; + + do + { + if (tz_colon_mask & 1) + *--bufp = ':'; + tz_colon_mask >>= 1; + *--bufp = u_number_value % 10 + L_('0'); + u_number_value /= 10; + } + while (u_number_value != 0 || tz_colon_mask != 0); + + do_number_sign_and_padding: + if (digits < width) + digits = width; + + sign_char = (negative_number ? L_('-') + : always_output_a_sign ? L_('+') + : 0); + + if (pad == L_('-')) + { + if (sign_char) + add1 (sign_char); + } + else + { + int padding = digits - (buf + (sizeof (buf) / sizeof (buf[0])) + - bufp) - !!sign_char; + + if (padding > 0) + { + if (pad == L_('_')) + { + if ((size_t) padding >= maxsize - i) + return 0; + + if (p) + memset_space (p, padding); + i += padding; + width = width > padding ? width - padding : 0; + if (sign_char) + add1 (sign_char); + } + else + { + if ((size_t) digits >= maxsize - i) + return 0; + + if (sign_char) + add1 (sign_char); + + if (p) + memset_zero (p, padding); + i += padding; + width = 0; + } + } + else + { + if (sign_char) + add1 (sign_char); + } + } + + cpy (buf + sizeof (buf) / sizeof (buf[0]) - bufp, bufp); + break; + + case L_('F'): + if (modifier != 0) + goto bad_format; + subfmt = L_("%Y-%m-%d"); + goto subformat; + + case L_('H'): + if (modifier == L_('E')) + goto bad_format; + + DO_NUMBER (2, tp->tm_hour); + + case L_('I'): + if (modifier == L_('E')) + goto bad_format; + + DO_NUMBER (2, hour12); + + case L_('k'): /* GNU extension. */ + if (modifier == L_('E')) + goto bad_format; + + DO_NUMBER_SPACEPAD (2, tp->tm_hour); + + case L_('l'): /* GNU extension. */ + if (modifier == L_('E')) + goto bad_format; + + DO_NUMBER_SPACEPAD (2, hour12); + + case L_('j'): + if (modifier == L_('E')) + goto bad_format; + + DO_SIGNED_NUMBER (3, tp->tm_yday < -1, tp->tm_yday + 1U); + + case L_('M'): + if (modifier == L_('E')) + goto bad_format; + + DO_NUMBER (2, tp->tm_min); + + case L_('m'): + if (modifier == L_('E')) + goto bad_format; + + DO_SIGNED_NUMBER (2, tp->tm_mon < -1, tp->tm_mon + 1U); + +#ifndef _LIBC + case L_('N'): /* GNU extension. */ + if (modifier == L_('E')) + goto bad_format; + + number_value = ns; + if (width == -1) + width = 9; + else + { + /* Take an explicit width less than 9 as a precision. */ + int j; + for (j = width; j < 9; j++) + number_value /= 10; + } + + DO_NUMBER (width, number_value); +#endif + + case L_('n'): + add1 (L_('\n')); + break; + + case L_('P'): + to_lowcase = true; +#ifndef _NL_CURRENT + format_char = L_('p'); +#endif + /* FALLTHROUGH */ + + case L_('p'): + if (change_case) + { + to_uppcase = false; + to_lowcase = true; + } +#ifdef _NL_CURRENT + cpy (ap_len, ampm); + break; +#else + goto underlying_strftime; +#endif + + case L_('R'): + subfmt = L_("%H:%M"); + goto subformat; + + case L_('r'): +#ifdef _NL_CURRENT + if (*(subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, + NLW(T_FMT_AMPM))) + == L_('\0')) + subfmt = L_("%I:%M:%S %p"); + goto subformat; +#else + goto underlying_strftime; +#endif + + case L_('S'): + if (modifier == L_('E')) + goto bad_format; + + DO_NUMBER (2, tp->tm_sec); + + case L_('s'): /* GNU extension. */ + { + struct tm ltm; + time_t t; + + ltm = *tp; + t = mktime (<m); + + /* Generate string value for T using time_t arithmetic; + this works even if sizeof (long) < sizeof (time_t). */ + + bufp = buf + sizeof (buf) / sizeof (buf[0]); + negative_number = t < 0; + + do + { + int d = t % 10; + t /= 10; + *--bufp = (negative_number ? -d : d) + L_('0'); + } + while (t != 0); + + digits = 1; + always_output_a_sign = false; + goto do_number_sign_and_padding; + } + + case L_('X'): + if (modifier == L_('O')) + goto bad_format; +#ifdef _NL_CURRENT + if (! (modifier == L_('E') + && (*(subfmt = + (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(ERA_T_FMT))) + != L_('\0')))) + subfmt = (const CHAR_T *) _NL_CURRENT (LC_TIME, NLW(T_FMT)); + goto subformat; +#else + goto underlying_strftime; +#endif + case L_('T'): + subfmt = L_("%H:%M:%S"); + goto subformat; + + case L_('t'): + add1 (L_('\t')); + break; + + case L_('u'): + DO_NUMBER (1, (tp->tm_wday - 1 + 7) % 7 + 1); + + case L_('U'): + if (modifier == L_('E')) + goto bad_format; + + DO_NUMBER (2, (tp->tm_yday - tp->tm_wday + 7) / 7); + + case L_('V'): + case L_('g'): + case L_('G'): + if (modifier == L_('E')) + goto bad_format; + { + /* YEAR is a leap year if and only if (tp->tm_year + TM_YEAR_BASE) + is a leap year, except that YEAR and YEAR - 1 both work + correctly even when (tp->tm_year + TM_YEAR_BASE) would + overflow. */ + int year = (tp->tm_year + + (tp->tm_year < 0 + ? TM_YEAR_BASE % 400 + : TM_YEAR_BASE % 400 - 400)); + int year_adjust = 0; + int days = iso_week_days (tp->tm_yday, tp->tm_wday); + + if (days < 0) + { + /* This ISO week belongs to the previous year. */ + year_adjust = -1; + days = iso_week_days (tp->tm_yday + (365 + __isleap (year - 1)), + tp->tm_wday); + } + else + { + int d = iso_week_days (tp->tm_yday - (365 + __isleap (year)), + tp->tm_wday); + if (0 <= d) + { + /* This ISO week belongs to the next year. */ + year_adjust = 1; + days = d; + } + } + + switch (*f) + { + case L_('g'): + { + int yy = (tp->tm_year % 100 + year_adjust) % 100; + DO_NUMBER (2, (0 <= yy + ? yy + : tp->tm_year < -TM_YEAR_BASE - year_adjust + ? -yy + : yy + 100)); + } + + case L_('G'): + DO_SIGNED_NUMBER (4, tp->tm_year < -TM_YEAR_BASE - year_adjust, + (tp->tm_year + (unsigned int) TM_YEAR_BASE + + year_adjust)); + + default: + DO_NUMBER (2, days / 7 + 1); + } + } + + case L_('W'): + if (modifier == L_('E')) + goto bad_format; + + DO_NUMBER (2, (tp->tm_yday - (tp->tm_wday - 1 + 7) % 7 + 7) / 7); + + case L_('w'): + if (modifier == L_('E')) + goto bad_format; + + DO_NUMBER (1, tp->tm_wday); + + case L_('Y'): + if (modifier == 'E') + { +#if HAVE_STRUCT_ERA_ENTRY + struct era_entry *era = _nl_get_era_entry (tp HELPER_LOCALE_ARG); + if (era) + { +# ifdef COMPILE_WIDE + subfmt = era->era_wformat; +# else + subfmt = era->era_format; +# endif + goto subformat; + } +#else + goto underlying_strftime; +#endif + } + if (modifier == L_('O')) + goto bad_format; + + DO_SIGNED_NUMBER (4, tp->tm_year < -TM_YEAR_BASE, + tp->tm_year + (unsigned int) TM_YEAR_BASE); + + case L_('y'): + if (modifier == L_('E')) + { +#if HAVE_STRUCT_ERA_ENTRY + struct era_entry *era = _nl_get_era_entry (tp HELPER_LOCALE_ARG); + if (era) + { + int delta = tp->tm_year - era->start_date[0]; + DO_NUMBER (1, (era->offset + + delta * era->absolute_direction)); + } +#else + goto underlying_strftime; +#endif + } + + { + int yy = tp->tm_year % 100; + if (yy < 0) + yy = tp->tm_year < - TM_YEAR_BASE ? -yy : yy + 100; + DO_NUMBER (2, yy); + } + + case L_('Z'): + if (change_case) + { + to_uppcase = false; + to_lowcase = true; + } + +#if HAVE_TZNAME + /* The tzset() call might have changed the value. */ + if (!(zone && *zone) && tp->tm_isdst >= 0) + zone = tzname[tp->tm_isdst != 0]; +#endif + if (! zone) + zone = ""; + +#ifdef COMPILE_WIDE + { + /* The zone string is always given in multibyte form. We have + to transform it first. */ + wchar_t *wczone; + size_t len; + widen (zone, wczone, len); + cpy (len, wczone); + } +#else + cpy (strlen (zone), zone); +#endif + break; + + case L_(':'): + /* :, ::, and ::: are valid only just before 'z'. + :::: etc. are rejected later. */ + for (colons = 1; f[colons] == L_(':'); colons++) + continue; + if (f[colons] != L_('z')) + goto bad_format; + f += colons; + goto do_z_conversion; + + case L_('z'): + colons = 0; + + do_z_conversion: + if (tp->tm_isdst < 0) + break; + + { + int diff; + int hour_diff; + int min_diff; + int sec_diff; +#if HAVE_TM_GMTOFF + diff = tp->tm_gmtoff; +#else + if (ut) + diff = 0; + else + { + struct tm gtm; + struct tm ltm; + time_t lt; + + ltm = *tp; + lt = mktime (<m); + + if (lt == (time_t) -1) + { + /* mktime returns -1 for errors, but -1 is also a + valid time_t value. Check whether an error really + occurred. */ + struct tm tm; + + if (! __localtime_r (<, &tm) + || ((ltm.tm_sec ^ tm.tm_sec) + | (ltm.tm_min ^ tm.tm_min) + | (ltm.tm_hour ^ tm.tm_hour) + | (ltm.tm_mday ^ tm.tm_mday) + | (ltm.tm_mon ^ tm.tm_mon) + | (ltm.tm_year ^ tm.tm_year))) + break; + } + + if (! __gmtime_r (<, >m)) + break; + + diff = tm_diff (<m, >m); + } +#endif + + hour_diff = diff / 60 / 60; + min_diff = diff / 60 % 60; + sec_diff = diff % 60; + + switch (colons) + { + case 0: /* +hhmm */ + DO_TZ_OFFSET (5, diff < 0, 0, hour_diff * 100 + min_diff); + + case 1: tz_hh_mm: /* +hh:mm */ + DO_TZ_OFFSET (6, diff < 0, 04, hour_diff * 100 + min_diff); + + case 2: tz_hh_mm_ss: /* +hh:mm:ss */ + DO_TZ_OFFSET (9, diff < 0, 024, + hour_diff * 10000 + min_diff * 100 + sec_diff); + + case 3: /* +hh if possible, else +hh:mm, else +hh:mm:ss */ + if (sec_diff != 0) + goto tz_hh_mm_ss; + if (min_diff != 0) + goto tz_hh_mm; + DO_TZ_OFFSET (3, diff < 0, 0, hour_diff); + + default: + goto bad_format; + } + } + + case L_('\0'): /* GNU extension: % at end of format. */ + --f; + /* Fall through. */ + default: + /* Unknown format; output the format, including the '%', + since this is most likely the right thing to do if a + multibyte string has been misparsed. */ + bad_format: + { + int flen; + for (flen = 1; f[1 - flen] != L_('%'); flen++) + continue; + cpy (flen, &f[1 - flen]); + } + break; + } + } + +#if ! FPRINTFTIME + if (p && maxsize != 0) + *p = L_('\0'); +#endif + + return i; +} + +/* Write information from TP into S according to the format + string FORMAT, writing no more that MAXSIZE characters + (including the terminating '\0') and returning number of + characters written. If S is NULL, nothing will be written + anywhere, so to determine how many characters would be + written, use NULL for S and (size_t) -1 for MAXSIZE. */ +size_t +my_strftime (STREAM_OR_CHAR_T *s, STRFTIME_ARG (size_t maxsize) + const CHAR_T *format, + const struct tm *tp extra_args_spec LOCALE_PARAM_PROTO) +{ + return strftime_case_ (false, s, STRFTIME_ARG (maxsize) + format, tp extra_args LOCALE_ARG); +} + +#if defined _LIBC && ! FPRINTFTIME +libc_hidden_def (my_strftime) +#endif + + +#if defined emacs && ! FPRINTFTIME +/* For Emacs we have a separate interface which corresponds to the normal + strftime function plus the ut argument, but without the ns argument. */ +size_t +emacs_strftimeu (char *s, size_t maxsize, const char *format, + const struct tm *tp, int ut) +{ + return my_strftime (s, maxsize, format, tp, ut, 0); +} +#endif diff --git a/gnu/strftime.h b/gnu/strftime.h new file mode 100644 index 0000000..eaeabe8 --- /dev/null +++ b/gnu/strftime.h @@ -0,0 +1,36 @@ +/* -*- buffer-read-only: t -*- vi: set ro: */ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* declarations for strftime.c + + Copyright (C) 2002, 2004, 2008-2014 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General 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 + +#ifdef __cplusplus +extern "C" { +#endif + +/* Just like strftime, but with two more arguments: + POSIX requires that strftime use the local timezone information. + When __UTC is nonzero and tm->tm_zone is NULL or the empty string, + use UTC instead. Use __NS as the number of nanoseconds in the + %N directive. */ +size_t nstrftime (char *, size_t, char const *, struct tm const *, + int __utc, int __ns); + +#ifdef __cplusplus +} +#endif diff --git a/gnu/string.in.h b/gnu/string.in.h index 8cac7f8..9719782 100644 --- a/gnu/string.in.h +++ b/gnu/string.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A GNU-like . - Copyright (C) 1995-1996, 2001-2013 Free Software Foundation, Inc. + Copyright (C) 1995-1996, 2001-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/strings.in.h b/gnu/strings.in.h index 1dc3c3a..c3d4613 100644 --- a/gnu/strings.in.h +++ b/gnu/strings.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A substitute . - Copyright (C) 2007-2013 Free Software Foundation, Inc. + Copyright (C) 2007-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/stripslash.c b/gnu/stripslash.c index f26a8ff..f9e7c13 100644 --- a/gnu/stripslash.c +++ b/gnu/stripslash.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* stripslash.c -- remove redundant trailing slashes from a file name - Copyright (C) 1990, 2001, 2003-2006, 2009-2013 Free Software Foundation, + Copyright (C) 1990, 2001, 2003-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/strncasecmp.c b/gnu/strncasecmp.c index 44196fd..b3f482c 100644 --- a/gnu/strncasecmp.c +++ b/gnu/strncasecmp.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* strncasecmp.c -- case insensitive string comparator - Copyright (C) 1998-1999, 2005-2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1998-1999, 2005-2007, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/strndup.c b/gnu/strndup.c index ffb50c5..34fb360 100644 --- a/gnu/strndup.c +++ b/gnu/strndup.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A replacement function, for systems that lack strndup. - Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2013 Free Software + Copyright (C) 1996-1998, 2001-2003, 2005-2007, 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it diff --git a/gnu/strnlen.c b/gnu/strnlen.c index 07f8030..09a7866 100644 --- a/gnu/strnlen.c +++ b/gnu/strnlen.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Find the length of STRING, but scan at most MAXLEN characters. - Copyright (C) 2005-2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc. Written by Simon Josefsson. This program is free software; you can redistribute it and/or modify diff --git a/gnu/strnlen1.c b/gnu/strnlen1.c index 5a378fa..70a2ed1 100644 --- a/gnu/strnlen1.c +++ b/gnu/strnlen1.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Find the length of STRING + 1, but scan at most MAXLEN bytes. - Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/strnlen1.h b/gnu/strnlen1.h index 81ea133..ae247a0 100644 --- a/gnu/strnlen1.h +++ b/gnu/strnlen1.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Find the length of STRING + 1, but scan at most MAXLEN bytes. - Copyright (C) 2005, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/strtoimax.c b/gnu/strtoimax.c index 740d505..8e7dfbf 100644 --- a/gnu/strtoimax.c +++ b/gnu/strtoimax.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Convert string representation of a number into an intmax_t value. - Copyright (C) 1999, 2001-2004, 2006, 2009-2013 Free Software Foundation, + Copyright (C) 1999, 2001-2004, 2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -30,48 +30,55 @@ #include "verify.h" #ifdef UNSIGNED -# ifndef HAVE_DECL_STRTOULL +# if HAVE_UNSIGNED_LONG_LONG_INT +# ifndef HAVE_DECL_STRTOULL "this configure-time declaration test was not run" -# endif -# if !HAVE_DECL_STRTOULL && HAVE_UNSIGNED_LONG_LONG_INT +# endif +# if !HAVE_DECL_STRTOULL unsigned long long int strtoull (char const *, char **, int); +# endif # endif #else -# ifndef HAVE_DECL_STRTOLL +# if HAVE_LONG_LONG_INT +# ifndef HAVE_DECL_STRTOLL "this configure-time declaration test was not run" -# endif -# if !HAVE_DECL_STRTOLL && HAVE_LONG_LONG_INT +# endif +# if !HAVE_DECL_STRTOLL long long int strtoll (char const *, char **, int); +# endif # endif #endif #ifdef UNSIGNED # define Have_long_long HAVE_UNSIGNED_LONG_LONG_INT # define Int uintmax_t +# define Strtoimax strtoumax +# define Strtol strtoul +# define Strtoll strtoull # define Unsigned unsigned -# define strtoimax strtoumax -# define strtol strtoul -# define strtoll strtoull #else # define Have_long_long HAVE_LONG_LONG_INT # define Int intmax_t +# define Strtoimax strtoimax +# define Strtol strtol +# define Strtoll strtoll # define Unsigned #endif Int -strtoimax (char const *ptr, char **endptr, int base) +Strtoimax (char const *ptr, char **endptr, int base) { #if Have_long_long verify (sizeof (Int) == sizeof (Unsigned long int) || sizeof (Int) == sizeof (Unsigned long long int)); if (sizeof (Int) != sizeof (Unsigned long int)) - return strtoll (ptr, endptr, base); + return Strtoll (ptr, endptr, base); #else verify (sizeof (Int) == sizeof (Unsigned long int)); #endif - return strtol (ptr, endptr, base); + return Strtol (ptr, endptr, base); } diff --git a/gnu/strtol.c b/gnu/strtol.c index 33d413a..6e2fd82 100644 --- a/gnu/strtol.c +++ b/gnu/strtol.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Convert string representation of a number into an integer value. - Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2013 Free Software + Copyright (C) 1991-1992, 1994-1999, 2003, 2005-2007, 2009-2014 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C diff --git a/gnu/strtoll.c b/gnu/strtoll.c new file mode 100644 index 0000000..04c95bc --- /dev/null +++ b/gnu/strtoll.c @@ -0,0 +1,35 @@ +/* -*- buffer-read-only: t -*- vi: set ro: */ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* Function to parse a 'long long int' from text. + Copyright (C) 1995-1997, 1999, 2001, 2009-2014 Free Software Foundation, + Inc. + This file is part of the GNU C Library. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#define QUAD 1 + +#include + +#ifdef _LIBC +# ifdef SHARED +# include + +# if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2) +compat_symbol (libc, __strtoll_internal, __strtoq_internal, GLIBC_2_0); +# endif + +# endif +weak_alias (strtoll, strtoq) +#endif diff --git a/gnu/strtoul.c b/gnu/strtoul.c index 8ed564c..eda4dd2 100644 --- a/gnu/strtoul.c +++ b/gnu/strtoul.c @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 1991, 1997, 2009-2013 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1997, 2009-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify diff --git a/gnu/strtoull.c b/gnu/strtoull.c index d282da0..3d3a7f0 100644 --- a/gnu/strtoull.c +++ b/gnu/strtoull.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Function to parse an 'unsigned long long int' from text. - Copyright (C) 1995-1997, 1999, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1995-1997, 1999, 2009-2014 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. Bugs can be reported to bug-glibc@gnu.org. diff --git a/gnu/symlink.c b/gnu/symlink.c index 1ad14a7..10936d4 100644 --- a/gnu/symlink.c +++ b/gnu/symlink.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Stub for symlink(). - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/symlinkat.c b/gnu/symlinkat.c index e8268c3..e63bf47 100644 --- a/gnu/symlinkat.c +++ b/gnu/symlinkat.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Create a symlink relative to an open directory. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/sys_stat.in.h b/gnu/sys_stat.in.h index 5cf467a..1cfcd83 100644 --- a/gnu/sys_stat.in.h +++ b/gnu/sys_stat.in.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Provide a more complete sys/stat header file. - Copyright (C) 2005-2013 Free Software Foundation, Inc. + Copyright (C) 2005-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/sys_time.in.h b/gnu/sys_time.in.h index 6b51c02..a8c28c0 100644 --- a/gnu/sys_time.in.h +++ b/gnu/sys_time.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Provide a more complete sys/time.h. - Copyright (C) 2007-2013 Free Software Foundation, Inc. + Copyright (C) 2007-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,11 +26,12 @@ #endif @PRAGMA_COLUMNS@ -/* On Cygwin, includes itself recursively via . +/* On Cygwin and on many BSDish systems, includes itself + recursively via . Simply delegate to the system's header in this case; it is a no-op. Without this extra ifdef, the C++ gettimeofday declaration below would be a forward declaration in gnulib's nested . */ -#ifdef _CYGWIN_SYS_TIME_H +#if defined _CYGWIN_SYS_TIME_H || defined _SYS_TIME_H || defined _SYS_TIME_H_ # @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@ #else diff --git a/gnu/sys_types.in.h b/gnu/sys_types.in.h index 2c2b47d..593dce0 100644 --- a/gnu/sys_types.in.h +++ b/gnu/sys_types.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Provide a more complete sys/types.h. - Copyright (C) 2011-2013 Free Software Foundation, Inc. + Copyright (C) 2011-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -25,7 +25,9 @@ #ifndef _@GUARD_PREFIX@_SYS_TYPES_H /* The include_next requires a split double-inclusion guard. */ +# define _GL_INCLUDING_SYS_TYPES_H #@INCLUDE_NEXT@ @NEXT_SYS_TYPES_H@ +# undef _GL_INCLUDING_SYS_TYPES_H #ifndef _@GUARD_PREFIX@_SYS_TYPES_H #define _@GUARD_PREFIX@_SYS_TYPES_H diff --git a/gnu/sysexits.in.h b/gnu/sysexits.in.h index c83400d..a1ea3c6 100644 --- a/gnu/sysexits.in.h +++ b/gnu/sysexits.in.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* exit() exit codes for some BSD system programs. - Copyright (C) 2003, 2006-2013 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/tempname.c b/gnu/tempname.c index 8fed363..8dbcb50 100644 --- a/gnu/tempname.c +++ b/gnu/tempname.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* tempname.c - generate the name of a temporary file. - Copyright (C) 1991-2003, 2005-2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1991-2003, 2005-2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/tempname.h b/gnu/tempname.h index e4076ce..f133161 100644 --- a/gnu/tempname.h +++ b/gnu/tempname.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Create a temporary file or directory. - Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/time.in.h b/gnu/time.in.h index 7dcac1d..6142964 100644 --- a/gnu/time.in.h +++ b/gnu/time.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A more-standard . - Copyright (C) 2007-2013 Free Software Foundation, Inc. + Copyright (C) 2007-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -50,20 +50,13 @@ /* Some systems don't define struct timespec (e.g., AIX 4.1, Ultrix 4.3). Or they define it with the wrong member names or define it in - (e.g., FreeBSD circa 1997). Stock Mingw does not define it, but the - pthreads-win32 library defines it in . */ + (e.g., FreeBSD circa 1997). Stock Mingw prior to 3.0 does not define it, + but the pthreads-win32 library defines it in . */ # if ! @TIME_H_DEFINES_STRUCT_TIMESPEC@ # if @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ # include # elif @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@ # include -/* The pthreads-win32 also defines a couple of broken macros. */ -# undef asctime_r -# undef ctime_r -# undef gmtime_r -# undef localtime_r -# undef rand_r -# undef strtok_r # else # ifdef __cplusplus @@ -189,6 +182,39 @@ _GL_CXXALIASWARN (gmtime_r); # endif # endif +/* Convert TIMER to RESULT, assuming local time and UTC respectively. See + and + . */ +# if @GNULIB_GETTIMEOFDAY@ +# if @REPLACE_LOCALTIME@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef localtime +# define localtime rpl_localtime +# endif +_GL_FUNCDECL_RPL (localtime, struct tm *, (time_t const *__timer) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (localtime, struct tm *, (time_t const *__timer)); +# else +_GL_CXXALIAS_SYS (localtime, struct tm *, (time_t const *__timer)); +# endif +_GL_CXXALIASWARN (localtime); +# endif + +# if @GNULIB_GETTIMEOFDAY@ +# if @REPLACE_GMTIME@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef gmtime +# define gmtime rpl_gmtime +# endif +_GL_FUNCDECL_RPL (gmtime, struct tm *, (time_t const *__timer) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (gmtime, struct tm *, (time_t const *__timer)); +# else +_GL_CXXALIAS_SYS (gmtime, struct tm *, (time_t const *__timer)); +# endif +_GL_CXXALIASWARN (gmtime); +# endif + /* Parse BUF as a time stamp, assuming FORMAT specifies its layout, and store the resulting broken-down time into TM. See . */ diff --git a/gnu/time_r.c b/gnu/time_r.c index 19c956e..773a47e 100644 --- a/gnu/time_r.c +++ b/gnu/time_r.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Reentrant time functions like localtime_r. - Copyright (C) 2003, 2006-2007, 2010-2013 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2010-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/timespec.h b/gnu/timespec.h index 18df4f0..1621d84 100644 --- a/gnu/timespec.h +++ b/gnu/timespec.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* timespec -- System time interface - Copyright (C) 2000, 2002, 2004-2005, 2007, 2009-2013 Free Software + Copyright (C) 2000, 2002, 2004-2005, 2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -23,11 +23,31 @@ # include +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif _GL_INLINE_HEADER_BEGIN #ifndef _GL_TIMESPEC_INLINE # define _GL_TIMESPEC_INLINE _GL_INLINE #endif +/* Resolution of timespec time stamps (in units per second), and log + base 10 of the resolution. */ + +enum { TIMESPEC_RESOLUTION = 1000000000 }; +enum { LOG10_TIMESPEC_RESOLUTION = 9 }; + +/* Return a timespec with seconds S and nanoseconds NS. */ + +_GL_TIMESPEC_INLINE struct timespec +make_timespec (time_t s, long int ns) +{ + struct timespec r; + r.tv_sec = s; + r.tv_nsec = ns; + return r; +} + /* Return negative, zero, positive if A < B, A == B, A > B, respectively. For each time stamp T, this code assumes that either: diff --git a/gnu/ttyname_r.c b/gnu/ttyname_r.c new file mode 100644 index 0000000..f1d13d1 --- /dev/null +++ b/gnu/ttyname_r.c @@ -0,0 +1,88 @@ +/* -*- buffer-read-only: t -*- vi: set ro: */ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* Determine name of a terminal. + + Copyright (C) 2010-2014 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +/* Written by Bruno Haible , 2010. */ + +#include + +#include + +#include +#include +#include + +int +ttyname_r (int fd, char *buf, size_t buflen) +#undef ttyname_r +{ + /* When ttyname_r exists, use it. */ +#if HAVE_TTYNAME_R + /* This code is multithread-safe. */ + /* On Solaris, ttyname_r always fails if buflen < 128. On OSF/1 5.1, + ttyname_r ignores the buffer size and assumes the buffer is large enough. + So provide a buffer that is large enough. */ + char largerbuf[512]; +# if HAVE_POSIXDECL_TTYNAME_R + int err = + (buflen < sizeof (largerbuf) + ? ttyname_r (fd, largerbuf, sizeof (largerbuf)) + : ttyname_r (fd, buf, buflen <= INT_MAX ? buflen : INT_MAX)); + if (err != 0) + return err; + if (buflen < sizeof (largerbuf)) + { + size_t namelen = strlen (largerbuf) + 1; + if (namelen > buflen) + return ERANGE; + memcpy (buf, largerbuf, namelen); + } +# else + char *name = + (buflen < sizeof (largerbuf) + ? ttyname_r (fd, largerbuf, sizeof (largerbuf)) + : ttyname_r (fd, buf, buflen <= INT_MAX ? buflen : INT_MAX)); + if (name == NULL) + return errno; + if (name != buf) + { + size_t namelen = strlen (name) + 1; + if (namelen > buflen) + return ERANGE; + memmove (buf, name, namelen); + } +# endif + return 0; +#elif HAVE_TTYNAME + /* Note: This is not multithread-safe. */ + char *name; + size_t namelen; + + name = ttyname (fd); + if (name == NULL) + return errno; + namelen = strlen (name) + 1; + if (namelen > buflen) + return ERANGE; + memcpy (buf, name, namelen); + return 0; +#else + /* Platforms like mingw: no ttys exist at all. */ + return ENOTTY; +#endif +} diff --git a/gnu/unistd--.h b/gnu/unistd--.h index 4ffc852..2a5c7e6 100644 --- a/gnu/unistd--.h +++ b/gnu/unistd--.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Like unistd.h, but redefine some names to avoid glitches. - Copyright (C) 2005, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/unistd-safer.h b/gnu/unistd-safer.h index 2754f42..def53d7 100644 --- a/gnu/unistd-safer.h +++ b/gnu/unistd-safer.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Invoke unistd-like functions, but avoid some glitches. - Copyright (C) 2001, 2003, 2005, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2001, 2003, 2005, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/unistd.in.h b/gnu/unistd.in.h index 7a8a7e7..c43d48c 100644 --- a/gnu/unistd.in.h +++ b/gnu/unistd.in.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Substitute for and wrapper around . - Copyright (C) 2003-2013 Free Software Foundation, Inc. + Copyright (C) 2003-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,9 +23,23 @@ #endif @PRAGMA_COLUMNS@ +#ifdef _GL_INCLUDING_UNISTD_H +/* Special invocation convention: + - On Mac OS X 10.3.9 we have a sequence of nested includes + -> -> -> + In this situation, the functions are not yet declared, therefore we cannot + provide the C++ aliases. */ + +#@INCLUDE_NEXT@ @NEXT_UNISTD_H@ + +#else +/* Normal invocation convention. */ + /* The include_next requires a split double-inclusion guard. */ #if @HAVE_UNISTD_H@ +# define _GL_INCLUDING_UNISTD_H # @INCLUDE_NEXT@ @NEXT_UNISTD_H@ +# undef _GL_INCLUDING_UNISTD_H #endif /* Get all possible declarations of gethostname(). */ @@ -118,6 +132,9 @@ # include #endif +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif _GL_INLINE_HEADER_BEGIN #ifndef _GL_UNISTD_INLINE # define _GL_UNISTD_INLINE _GL_INLINE @@ -653,10 +670,19 @@ _GL_WARN_ON_USE (getdomainname, "getdomainname is unportable - " #if @GNULIB_GETDTABLESIZE@ /* Return the maximum number of file descriptors in the current process. In POSIX, this is same as sysconf (_SC_OPEN_MAX). */ -# if !@HAVE_GETDTABLESIZE@ +# if @REPLACE_GETDTABLESIZE@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef getdtablesize +# define getdtablesize rpl_getdtablesize +# endif +_GL_FUNCDECL_RPL (getdtablesize, int, (void)); +_GL_CXXALIAS_RPL (getdtablesize, int, (void)); +# else +# if !@HAVE_GETDTABLESIZE@ _GL_FUNCDECL_SYS (getdtablesize, int, (void)); -# endif +# endif _GL_CXXALIAS_SYS (getdtablesize, int, (void)); +# endif _GL_CXXALIASWARN (getdtablesize); #elif defined GNULIB_POSIXCHECK # undef getdtablesize @@ -1529,4 +1555,5 @@ _GL_CXXALIASWARN (write); _GL_INLINE_HEADER_END #endif /* _@GUARD_PREFIX@_UNISTD_H */ +#endif /* _GL_INCLUDING_UNISTD_H */ #endif /* _@GUARD_PREFIX@_UNISTD_H */ diff --git a/gnu/unitypes.in.h b/gnu/unitypes.in.h index 54eed80..1a69a97 100644 --- a/gnu/unitypes.in.h +++ b/gnu/unitypes.in.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Elementary types and macros for the GNU UniString library. - Copyright (C) 2002, 2005-2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published diff --git a/gnu/uniwidth.in.h b/gnu/uniwidth.in.h index 57e407c..6da964b 100644 --- a/gnu/uniwidth.in.h +++ b/gnu/uniwidth.in.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Display width functions. - Copyright (C) 2001-2002, 2005, 2007, 2009-2013 Free Software Foundation, + Copyright (C) 2001-2002, 2005, 2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it diff --git a/gnu/uniwidth/cjk.h b/gnu/uniwidth/cjk.h index 30ad5ee..ac1ec26 100644 --- a/gnu/uniwidth/cjk.h +++ b/gnu/uniwidth/cjk.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Test for CJK encoding. - Copyright (C) 2001-2002, 2005-2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2005-2007, 2009-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify it diff --git a/gnu/uniwidth/width.c b/gnu/uniwidth/width.c index 9be4053..967c081 100644 --- a/gnu/uniwidth/width.c +++ b/gnu/uniwidth/width.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Determine display width of Unicode character. - Copyright (C) 2001-2002, 2006-2013 Free Software Foundation, Inc. + Copyright (C) 2001-2002, 2006-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2002. This program is free software: you can redistribute it and/or modify it diff --git a/gnu/unlink.c b/gnu/unlink.c index 9ec3f31..abbc986 100644 --- a/gnu/unlink.c +++ b/gnu/unlink.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Work around unlink bugs. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/unlinkat.c b/gnu/unlinkat.c index 6340d77..242ad49 100644 --- a/gnu/unlinkat.c +++ b/gnu/unlinkat.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Work around unlinkat bugs on Solaris 9 and Hurd. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/unlinkdir.c b/gnu/unlinkdir.c index 592f01e..fa0e1a4 100644 --- a/gnu/unlinkdir.c +++ b/gnu/unlinkdir.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* unlinkdir.c - determine whether we can unlink directories - Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/unlinkdir.h b/gnu/unlinkdir.h index a158ec5..a1bb30d 100644 --- a/gnu/unlinkdir.h +++ b/gnu/unlinkdir.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* unlinkdir.h - determine (and maybe change) whether we can unlink directories - Copyright (C) 2005, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/unlocked-io.h b/gnu/unlocked-io.h index fb2dc00..94d89f4 100644 --- a/gnu/unlocked-io.h +++ b/gnu/unlocked-io.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Prefer faster, non-thread-safe stdio functions if available. - Copyright (C) 2001-2004, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2001-2004, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/unlockpt.c b/gnu/unlockpt.c new file mode 100644 index 0000000..d4e0bdd --- /dev/null +++ b/gnu/unlockpt.c @@ -0,0 +1,46 @@ +/* -*- buffer-read-only: t -*- vi: set ro: */ +/* DO NOT EDIT! GENERATED AUTOMATICALLY! */ +/* Unlock the slave side of a pseudo-terminal from its master side. + Copyright (C) 1998, 2010-2014 Free Software Foundation, Inc. + Contributed by Zack Weinberg , 1998. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General 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 + +#include +#include + +int +unlockpt (int fd) +{ + /* Platforms which have the TIOCSPTLCK ioctl (Linux) already have the + unlockpt function. */ +#if HAVE_REVOKE + /* Mac OS X 10.3, OpenBSD 3.8 do not have the unlockpt function, but they + have revoke(). */ + char *name = ptsname (fd); + if (name == NULL) + return -1; + return revoke (name); +#else + /* Assume that the slave side of a pseudo-terminal is already unlocked + by default. */ + if (fcntl (fd, F_GETFD) < 0) + return -1; + return 0; +#endif +} diff --git a/gnu/unsetenv.c b/gnu/unsetenv.c index c92884e..d68c159 100644 --- a/gnu/unsetenv.c +++ b/gnu/unsetenv.c @@ -1,6 +1,6 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ -/* Copyright (C) 1992, 1995-2002, 2005-2013 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1995-2002, 2005-2014 Free Software Foundation, Inc. This file is part of the GNU C Library. This program is free software: you can redistribute it and/or modify diff --git a/gnu/utimens.c b/gnu/utimens.c index ed7a75f..116070c 100644 --- a/gnu/utimens.c +++ b/gnu/utimens.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Set file access and modification times. - Copyright (C) 2003-2013 Free Software Foundation, Inc. + Copyright (C) 2003-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -92,10 +92,12 @@ validate_timespec (struct timespec timespec[2]) assert (timespec); if ((timespec[0].tv_nsec != UTIME_NOW && timespec[0].tv_nsec != UTIME_OMIT - && (timespec[0].tv_nsec < 0 || 1000000000 <= timespec[0].tv_nsec)) + && ! (0 <= timespec[0].tv_nsec + && timespec[0].tv_nsec < TIMESPEC_RESOLUTION)) || (timespec[1].tv_nsec != UTIME_NOW && timespec[1].tv_nsec != UTIME_OMIT - && (timespec[1].tv_nsec < 0 || 1000000000 <= timespec[1].tv_nsec))) + && ! (0 <= timespec[1].tv_nsec + && timespec[1].tv_nsec < TIMESPEC_RESOLUTION))) { errno = EINVAL; return -1; diff --git a/gnu/utimens.h b/gnu/utimens.h index 89b3451..d9965a8 100644 --- a/gnu/utimens.h +++ b/gnu/utimens.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Set file access and modification times. - Copyright 2012-2013 Free Software Foundation, Inc. + Copyright 2012-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -28,6 +28,9 @@ int lutimens (char const *, struct timespec const [2]); # include # include +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif _GL_INLINE_HEADER_BEGIN #ifndef _GL_UTIMENS_INLINE # define _GL_UTIMENS_INLINE _GL_INLINE diff --git a/gnu/utimensat.c b/gnu/utimensat.c index de7d595..9a88198 100644 --- a/gnu/utimensat.c +++ b/gnu/utimensat.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Set the access and modification time of a file relative to directory fd. - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -95,11 +95,11 @@ rpl_utimensat (int fd, char const *file, struct timespec const times[2], values. */ else if (times && ((times[0].tv_nsec != UTIME_NOW - && (times[0].tv_nsec < 0 - || times[0].tv_nsec >= 1000000000)) + && ! (0 <= times[0].tv_nsec + && times[0].tv_nsec < TIMESPEC_RESOLUTION)) || (times[1].tv_nsec != UTIME_NOW - && (times[1].tv_nsec < 0 - || times[1].tv_nsec >= 1000000000)))) + && ! (0 <= times[1].tv_nsec + && times[1].tv_nsec < TIMESPEC_RESOLUTION)))) { errno = EINVAL; return -1; diff --git a/gnu/vasnprintf.c b/gnu/vasnprintf.c index acc6923..c959c54 100644 --- a/gnu/vasnprintf.c +++ b/gnu/vasnprintf.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* vsprintf with automatic memory allocation. - Copyright (C) 1999, 2002-2013 Free Software Foundation, Inc. + Copyright (C) 1999, 2002-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/vasnprintf.h b/gnu/vasnprintf.h index c496cd2..7b93040 100644 --- a/gnu/vasnprintf.h +++ b/gnu/vasnprintf.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* vsprintf with automatic memory allocation. - Copyright (C) 2002-2004, 2007-2013 Free Software Foundation, Inc. + Copyright (C) 2002-2004, 2007-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/vasprintf.c b/gnu/vasprintf.c index ce8c815..7882c95 100644 --- a/gnu/vasprintf.c +++ b/gnu/vasprintf.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Formatted output to strings. - Copyright (C) 1999, 2002, 2006-2013 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2006-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/verify.h b/gnu/verify.h index 36bc878..ec515b3 100644 --- a/gnu/verify.h +++ b/gnu/verify.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Compile-time assert-like macros. - Copyright (C) 2005-2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2005-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ /* Written by Paul Eggert, Bruno Haible, and Jim Meyering. */ #ifndef _GL_VERIFY_H -# define _GL_VERIFY_H +#define _GL_VERIFY_H /* Define _GL_HAVE__STATIC_ASSERT to 1 if _Static_assert works as per C11. @@ -33,16 +33,24 @@ Use this only with GCC. If we were willing to slow 'configure' down we could also use it with other compilers, but since this affects only the quality of diagnostics, why bother? */ -# if (4 < __GNUC__ + (6 <= __GNUC_MINOR__) \ - && (201112L <= __STDC_VERSION__ || !defined __STRICT_ANSI__) \ - && !defined __cplusplus) -# define _GL_HAVE__STATIC_ASSERT 1 -# endif +#if (4 < __GNUC__ + (6 <= __GNUC_MINOR__) \ + && (201112L <= __STDC_VERSION__ || !defined __STRICT_ANSI__) \ + && !defined __cplusplus) +# define _GL_HAVE__STATIC_ASSERT 1 +#endif /* The condition (99 < __GNUC__) is temporary, until we know about the first G++ release that supports static_assert. */ -# if (99 < __GNUC__) && defined __cplusplus -# define _GL_HAVE_STATIC_ASSERT 1 -# endif +#if (99 < __GNUC__) && defined __cplusplus +# define _GL_HAVE_STATIC_ASSERT 1 +#endif + +/* FreeBSD 9.1 , included by and lots of other + system headers, defines a conflicting _Static_assert that is no + better than ours; override it. */ +#ifndef _GL_HAVE_STATIC_ASSERT +# include +# undef _Static_assert +#endif /* Each of these macros verifies that its argument R is nonzero. To be portable, R should be an integer constant expression. Unlike @@ -145,50 +153,50 @@ Use a template type to work around the problem. */ /* Concatenate two preprocessor tokens. */ -# define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y) -# define _GL_CONCAT0(x, y) x##y +#define _GL_CONCAT(x, y) _GL_CONCAT0 (x, y) +#define _GL_CONCAT0(x, y) x##y /* _GL_COUNTER is an integer, preferably one that changes each time we use it. Use __COUNTER__ if it works, falling back on __LINE__ otherwise. __LINE__ isn't perfect, but it's better than a constant. */ -# if defined __COUNTER__ && __COUNTER__ != __COUNTER__ -# define _GL_COUNTER __COUNTER__ -# else -# define _GL_COUNTER __LINE__ -# endif +#if defined __COUNTER__ && __COUNTER__ != __COUNTER__ +# define _GL_COUNTER __COUNTER__ +#else +# define _GL_COUNTER __LINE__ +#endif /* Generate a symbol with the given prefix, making it unique if possible. */ -# define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER) +#define _GL_GENSYM(prefix) _GL_CONCAT (prefix, _GL_COUNTER) /* Verify requirement R at compile-time, as an integer constant expression that returns 1. If R is false, fail at compile-time, preferably with a diagnostic that includes the string-literal DIAGNOSTIC. */ -# define _GL_VERIFY_TRUE(R, DIAGNOSTIC) \ - (!!sizeof (_GL_VERIFY_TYPE (R, DIAGNOSTIC))) +#define _GL_VERIFY_TRUE(R, DIAGNOSTIC) \ + (!!sizeof (_GL_VERIFY_TYPE (R, DIAGNOSTIC))) -# ifdef __cplusplus -# if !GNULIB_defined_struct__gl_verify_type +#ifdef __cplusplus +# if !GNULIB_defined_struct__gl_verify_type template struct _gl_verify_type { unsigned int _gl_verify_error_if_negative: w; }; -# define GNULIB_defined_struct__gl_verify_type 1 -# endif -# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ - _gl_verify_type<(R) ? 1 : -1> -# elif defined _GL_HAVE__STATIC_ASSERT -# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ - struct { \ - _Static_assert (R, DIAGNOSTIC); \ - int _gl_dummy; \ - } -# else -# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ - struct { unsigned int _gl_verify_error_if_negative: (R) ? 1 : -1; } +# define GNULIB_defined_struct__gl_verify_type 1 # endif +# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ + _gl_verify_type<(R) ? 1 : -1> +#elif defined _GL_HAVE__STATIC_ASSERT +# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ + struct { \ + _Static_assert (R, DIAGNOSTIC); \ + int _gl_dummy; \ + } +#else +# define _GL_VERIFY_TYPE(R, DIAGNOSTIC) \ + struct { unsigned int _gl_verify_error_if_negative: (R) ? 1 : -1; } +#endif /* Verify requirement R at compile-time, as a declaration without a trailing ';'. If R is false, fail at compile-time, preferably @@ -197,23 +205,23 @@ template Unfortunately, unlike C11, this implementation must appear as an ordinary declaration, and cannot appear inside struct { ... }. */ -# ifdef _GL_HAVE__STATIC_ASSERT -# define _GL_VERIFY _Static_assert -# else -# define _GL_VERIFY(R, DIAGNOSTIC) \ - extern int (*_GL_GENSYM (_gl_verify_function) (void)) \ - [_GL_VERIFY_TRUE (R, DIAGNOSTIC)] -# endif +#ifdef _GL_HAVE__STATIC_ASSERT +# define _GL_VERIFY _Static_assert +#else +# define _GL_VERIFY(R, DIAGNOSTIC) \ + extern int (*_GL_GENSYM (_gl_verify_function) (void)) \ + [_GL_VERIFY_TRUE (R, DIAGNOSTIC)] +#endif /* _GL_STATIC_ASSERT_H is defined if this code is copied into assert.h. */ -# ifdef _GL_STATIC_ASSERT_H -# if !defined _GL_HAVE__STATIC_ASSERT && !defined _Static_assert -# define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC) -# endif -# if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert -# define static_assert _Static_assert /* C11 requires this #define. */ -# endif +#ifdef _GL_STATIC_ASSERT_H +# if !defined _GL_HAVE__STATIC_ASSERT && !defined _Static_assert +# define _Static_assert(R, DIAGNOSTIC) _GL_VERIFY (R, DIAGNOSTIC) # endif +# if !defined _GL_HAVE_STATIC_ASSERT && !defined static_assert +# define static_assert _Static_assert /* C11 requires this #define. */ +# endif +#endif /* @assert.h omit start@ */ @@ -231,18 +239,42 @@ template verify_true is obsolescent; please use verify_expr instead. */ -# define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")") +#define verify_true(R) _GL_VERIFY_TRUE (R, "verify_true (" #R ")") /* Verify requirement R at compile-time. Return the value of the expression E. */ -# define verify_expr(R, E) \ - (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E)) +#define verify_expr(R, E) \ + (_GL_VERIFY_TRUE (R, "verify_expr (" #R ", " #E ")") ? (E) : (E)) /* Verify requirement R at compile-time, as a declaration without a trailing ';'. */ -# define verify(R) _GL_VERIFY (R, "verify (" #R ")") +#define verify(R) _GL_VERIFY (R, "verify (" #R ")") + +#ifndef __has_builtin +# define __has_builtin(x) 0 +#endif + +/* Assume that R always holds. This lets the compiler optimize + accordingly. R should not have side-effects; it may or may not be + evaluated. Behavior is undefined if R is false. */ + +#if (__has_builtin (__builtin_unreachable) \ + || 4 < __GNUC__ + (5 <= __GNUC_MINOR__)) +# define assume(R) ((R) ? (void) 0 : __builtin_unreachable ()) +#elif 1200 <= _MSC_VER +# define assume(R) __assume (R) +#elif (defined lint \ + && (__has_builtin (__builtin_trap) \ + || 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__)))) + /* Doing it this way helps various packages when configured with + --enable-gcc-warnings, which compiles with -Dlint. It's nicer + when 'assume' silences warnings even with older GCCs. */ +# define assume(R) ((R) ? (void) 0 : __builtin_trap ()) +#else +# define assume(R) ((void) (0 && (R))) +#endif /* @assert.h omit end@ */ diff --git a/gnu/version-etc-fsf.c b/gnu/version-etc-fsf.c index 4eb3d98..99d048e 100644 --- a/gnu/version-etc-fsf.c +++ b/gnu/version-etc-fsf.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Variable with FSF copyright information, for version-etc. - Copyright (C) 1999-2006, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1999-2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/version-etc.c b/gnu/version-etc.c index 420003f..094d992 100644 --- a/gnu/version-etc.c +++ b/gnu/version-etc.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Print --version and bug-reporting information in a consistent format. - Copyright (C) 1999-2013 Free Software Foundation, Inc. + Copyright (C) 1999-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -40,7 +40,7 @@ # define PACKAGE PACKAGE_TARNAME #endif -enum { COPYRIGHT_YEAR = 2013 }; +enum { COPYRIGHT_YEAR = 2014 }; /* The three functions below display the --version information the standard way. diff --git a/gnu/version-etc.h b/gnu/version-etc.h index 8071ecb..a5ddc22 100644 --- a/gnu/version-etc.h +++ b/gnu/version-etc.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Print --version and bug-reporting information in a consistent format. - Copyright (C) 1999, 2003, 2005, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1999, 2003, 2005, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/vsnprintf.c b/gnu/vsnprintf.c index 262c6a4..7074150 100644 --- a/gnu/vsnprintf.c +++ b/gnu/vsnprintf.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Formatted output to strings. - Copyright (C) 2004, 2006-2013 Free Software Foundation, Inc. + Copyright (C) 2004, 2006-2014 Free Software Foundation, Inc. Written by Simon Josefsson and Yoann Vandoorselaere . This program is free software; you can redistribute it and/or modify diff --git a/gnu/wchar.in.h b/gnu/wchar.in.h index 17abaaf..59171b6 100644 --- a/gnu/wchar.in.h +++ b/gnu/wchar.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A substitute for ISO C99 , for platforms that have issues. - Copyright (C) 2007-2013 Free Software Foundation, Inc. + Copyright (C) 2007-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/wcrtomb.c b/gnu/wcrtomb.c index 3dc65f7..0cd4cb9 100644 --- a/gnu/wcrtomb.c +++ b/gnu/wcrtomb.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Convert wide character to multibyte character. - Copyright (C) 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2008-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/gnu/wctype.in.h b/gnu/wctype.in.h index 0cb71a1..892e49e 100644 --- a/gnu/wctype.in.h +++ b/gnu/wctype.in.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A substitute for ISO C99 , for platforms that lack it. - Copyright (C) 2006-2013 Free Software Foundation, Inc. + Copyright (C) 2006-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -63,6 +63,9 @@ #ifndef _@GUARD_PREFIX@_WCTYPE_H #define _@GUARD_PREFIX@_WCTYPE_H +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif _GL_INLINE_HEADER_BEGIN #ifndef _GL_WCTYPE_INLINE # define _GL_WCTYPE_INLINE _GL_INLINE diff --git a/gnu/wcwidth.c b/gnu/wcwidth.c index 5662637..7863880 100644 --- a/gnu/wcwidth.c +++ b/gnu/wcwidth.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Determine the number of screen columns needed for a character. - Copyright (C) 2006-2007, 2010-2013 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 2010-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/write.c b/gnu/write.c index 53223c7..5b58738 100644 --- a/gnu/write.c +++ b/gnu/write.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* POSIX compatible write() function. - Copyright (C) 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2008-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2008. This program is free software: you can redistribute it and/or modify diff --git a/gnu/xalloc-die.c b/gnu/xalloc-die.c index bb8f1c2..6699df2 100644 --- a/gnu/xalloc-die.c +++ b/gnu/xalloc-die.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Report a memory allocation failure and exit. - Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2013 Free Software + Copyright (C) 1997-2000, 2002-2004, 2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/xalloc-oversized.h b/gnu/xalloc-oversized.h index 8a34e95..6e52097 100644 --- a/gnu/xalloc-oversized.h +++ b/gnu/xalloc-oversized.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* xalloc-oversized.h -- memory allocation size checking - Copyright (C) 1990-2000, 2003-2004, 2006-2013 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2003-2004, 2006-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/xalloc.h b/gnu/xalloc.h index a9595b8..3369977 100644 --- a/gnu/xalloc.h +++ b/gnu/xalloc.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* xalloc.h -- malloc with out-of-memory checking - Copyright (C) 1990-2000, 2003-2004, 2006-2013 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2003-2004, 2006-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -24,6 +24,9 @@ #include "xalloc-oversized.h" +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif _GL_INLINE_HEADER_BEGIN #ifndef XALLOC_INLINE # define XALLOC_INLINE _GL_INLINE diff --git a/gnu/xasprintf.c b/gnu/xasprintf.c index 46fb71b..f8ded74 100644 --- a/gnu/xasprintf.c +++ b/gnu/xasprintf.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* vasprintf and asprintf with out-of-memory checking. - Copyright (C) 1999, 2002-2004, 2006, 2009-2013 Free Software Foundation, + Copyright (C) 1999, 2002-2004, 2006, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/xgetcwd.c b/gnu/xgetcwd.c index 5fa5bcd..5dcb23a 100644 --- a/gnu/xgetcwd.c +++ b/gnu/xgetcwd.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* xgetcwd.c -- return current directory with unlimited length - Copyright (C) 2001, 2003-2004, 2006-2007, 2009-2013 Free Software + Copyright (C) 2001, 2003-2004, 2006-2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/xgetcwd.h b/gnu/xgetcwd.h index 055449f..81b53ca 100644 --- a/gnu/xgetcwd.h +++ b/gnu/xgetcwd.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* prototype for xgetcwd - Copyright (C) 1995, 2001, 2003, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 1995, 2001, 2003, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/xmalloc.c b/gnu/xmalloc.c index 2d50af6..de7e43f 100644 --- a/gnu/xmalloc.c +++ b/gnu/xmalloc.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* xmalloc.c -- malloc with out of memory checking - Copyright (C) 1990-2000, 2002-2006, 2008-2013 Free Software Foundation, Inc. + Copyright (C) 1990-2000, 2002-2006, 2008-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/xsize.h b/gnu/xsize.h index a0bd766..3d9fd9a 100644 --- a/gnu/xsize.h +++ b/gnu/xsize.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* xsize.h -- Checked size_t computations. - Copyright (C) 2003, 2008-2013 Free Software Foundation, Inc. + Copyright (C) 2003, 2008-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,6 +29,9 @@ # include #endif +#ifndef _GL_INLINE_HEADER_BEGIN + #error "Please include config.h first." +#endif _GL_INLINE_HEADER_BEGIN #ifndef XSIZE_INLINE # define XSIZE_INLINE _GL_INLINE diff --git a/gnu/xstrndup.c b/gnu/xstrndup.c index 790a163..9b7a302 100644 --- a/gnu/xstrndup.c +++ b/gnu/xstrndup.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Duplicate a bounded initial segment of a string, with out-of-memory checking. - Copyright (C) 2003, 2006-2007, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2003, 2006-2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/xstrndup.h b/gnu/xstrndup.h index 0279dee..092a8d5 100644 --- a/gnu/xstrndup.h +++ b/gnu/xstrndup.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* Duplicate a bounded initial segment of a string, with out-of-memory checking. - Copyright (C) 2003, 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2003, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/xstrtol-error.c b/gnu/xstrtol-error.c index eaf3866..03a3a4d 100644 --- a/gnu/xstrtol-error.c +++ b/gnu/xstrtol-error.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A more useful interface to strtol. - Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2013 Free Software + Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/xstrtol.c b/gnu/xstrtol.c index 5d1b732..c8d68af 100644 --- a/gnu/xstrtol.c +++ b/gnu/xstrtol.c @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A more useful interface to strtol. - Copyright (C) 1995-1996, 1998-2001, 2003-2007, 2009-2013 Free Software + Copyright (C) 1995-1996, 1998-2001, 2003-2007, 2009-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/xstrtol.h b/gnu/xstrtol.h index 94118df..a073374 100644 --- a/gnu/xstrtol.h +++ b/gnu/xstrtol.h @@ -2,7 +2,7 @@ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* A more useful interface to strtol. - Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2013 Free Software + Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify diff --git a/gnu/xvasprintf.c b/gnu/xvasprintf.c index 6aca8c6..31c96ab 100644 --- a/gnu/xvasprintf.c +++ b/gnu/xvasprintf.c @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* vasprintf and asprintf with out-of-memory checking. - Copyright (C) 1999, 2002-2004, 2006-2013 Free Software Foundation, Inc. + Copyright (C) 1999, 2002-2004, 2006-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/gnu/xvasprintf.h b/gnu/xvasprintf.h index 4c333b6..1c19710 100644 --- a/gnu/xvasprintf.h +++ b/gnu/xvasprintf.h @@ -1,7 +1,7 @@ /* -*- buffer-read-only: t -*- vi: set ro: */ /* DO NOT EDIT! GENERATED AUTOMATICALLY! */ /* vasprintf and asprintf with out-of-memory checking. - Copyright (C) 2002-2004, 2006-2013 Free Software Foundation, Inc. + Copyright (C) 2002-2004, 2006-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/Makefile.am b/lib/Makefile.am index 3cbd060..b2971a2 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,6 +1,6 @@ # Makefile for GNU tar library. -*- Makefile -*- -# Copyright 1994-1997, 1999-2001, 2003-2007, 2009-2010, 2013 Free +# Copyright 1994-1997, 1999-2001, 2003-2007, 2009-2010, 2013-2014 Free # Software Foundation, Inc. # This file is part of GNU tar. diff --git a/lib/Makefile.in b/lib/Makefile.in index b3053de..41a9aca 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.6 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,7 @@ # Makefile for GNU tar library. -*- Makefile -*- -# Copyright 1994-1997, 1999-2001, 2003-2007, 2009-2010, 2013 Free +# Copyright 1994-1997, 1999-2001, 2003-2007, 2009-2010, 2013-2014 Free # Software Foundation, Inc. # This file is part of GNU tar. @@ -36,23 +36,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -72,14 +100,14 @@ build_triplet = @build@ host_triplet = @host@ @TAR_COND_XATTR_H_FALSE@am__append_1 = attr/xattr.h subdir = lib -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build-aux/depcomp +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/build-aux/depcomp $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ - $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/alloca.m4 \ - $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/backupfile.m4 \ - $(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/btowc.m4 \ - $(top_srcdir)/m4/canonicalize.m4 \ + $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/acl.m4 \ + $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argp.m4 \ + $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \ + $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/chown.m4 \ $(top_srcdir)/m4/clock_time.m4 \ $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ @@ -91,9 +119,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup.m4 \ $(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/eealloc.m4 \ $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/errno_h.m4 \ - $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exponentd.m4 \ - $(top_srcdir)/m4/extensions.m4 \ - $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fchdir.m4 \ + $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/euidaccess.m4 \ + $(top_srcdir)/m4/exponentd.m4 $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/extern-inline.m4 \ + $(top_srcdir)/m4/faccessat.m4 $(top_srcdir)/m4/fchdir.m4 \ $(top_srcdir)/m4/fchmodat.m4 $(top_srcdir)/m4/fchownat.m4 \ $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl.m4 \ $(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fdopendir.m4 \ @@ -105,19 +134,21 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/m4/getcwd-path-max.m4 $(top_srcdir)/m4/getcwd.m4 \ $(top_srcdir)/m4/getdelim.m4 $(top_srcdir)/m4/getdtablesize.m4 \ - $(top_srcdir)/m4/getline.m4 $(top_srcdir)/m4/getopt.m4 \ - $(top_srcdir)/m4/getpagesize.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gettime.m4 $(top_srcdir)/m4/gettimeofday.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/human.m4 \ + $(top_srcdir)/m4/getgroups.m4 $(top_srcdir)/m4/getline.m4 \ + $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/getpagesize.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettime.m4 \ + $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ + $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 \ + $(top_srcdir)/m4/group-member.m4 $(top_srcdir)/m4/human.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/include_next.m4 \ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \ $(top_srcdir)/m4/inttostr.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ - $(top_srcdir)/m4/iswblank.m4 $(top_srcdir)/m4/langinfo_h.m4 \ - $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lchown.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/isatty.m4 $(top_srcdir)/m4/iswblank.m4 \ + $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ + $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ $(top_srcdir)/m4/link-follow.m4 $(top_srcdir)/m4/link.m4 \ $(top_srcdir)/m4/linkat.m4 $(top_srcdir)/m4/localcharset.m4 \ @@ -143,19 +174,21 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/paxutils.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf.m4 \ - $(top_srcdir)/m4/priv-set.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ - $(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \ - $(top_srcdir)/m4/read.m4 $(top_srcdir)/m4/readdir.m4 \ - $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/readlinkat.m4 \ - $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.m4 \ - $(top_srcdir)/m4/rename.m4 $(top_srcdir)/m4/renameat.m4 \ - $(top_srcdir)/m4/rewinddir.m4 $(top_srcdir)/m4/rmdir.m4 \ - $(top_srcdir)/m4/rmt.m4 $(top_srcdir)/m4/rpmatch.m4 \ - $(top_srcdir)/m4/rtapelib.m4 $(top_srcdir)/m4/safe-read.m4 \ - $(top_srcdir)/m4/safe-write.m4 $(top_srcdir)/m4/save-cwd.m4 \ - $(top_srcdir)/m4/savedir.m4 $(top_srcdir)/m4/secure_getenv.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix_openpt.m4 \ + $(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/priv-set.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/ptsname.m4 \ + $(top_srcdir)/m4/ptsname_r.m4 $(top_srcdir)/m4/quote.m4 \ + $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/raise.m4 \ + $(top_srcdir)/m4/rawmemchr.m4 $(top_srcdir)/m4/read.m4 \ + $(top_srcdir)/m4/readdir.m4 $(top_srcdir)/m4/readlink.m4 \ + $(top_srcdir)/m4/readlinkat.m4 $(top_srcdir)/m4/realloc.m4 \ + $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rename.m4 \ + $(top_srcdir)/m4/renameat.m4 $(top_srcdir)/m4/rewinddir.m4 \ + $(top_srcdir)/m4/rmdir.m4 $(top_srcdir)/m4/rmt.m4 \ + $(top_srcdir)/m4/rpmatch.m4 $(top_srcdir)/m4/rtapelib.m4 \ + $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/safe-write.m4 \ + $(top_srcdir)/m4/save-cwd.m4 $(top_srcdir)/m4/savedir.m4 \ + $(top_srcdir)/m4/secure_getenv.m4 \ $(top_srcdir)/m4/selinux-context-h.m4 \ $(top_srcdir)/m4/selinux-selinux-h.m4 \ $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/signal_h.m4 \ @@ -168,20 +201,23 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \ $(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \ - $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strings_h.m4 $(top_srcdir)/m4/strndup.m4 \ - $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strtol.m4 \ - $(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \ - $(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/symlink.m4 \ - $(top_srcdir)/m4/symlinkat.m4 $(top_srcdir)/m4/sys_socket_h.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strftime.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \ + $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ + $(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \ + $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \ + $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \ + $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/symlinkat.m4 \ + $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sysexits.m4 \ $(top_srcdir)/m4/system.m4 $(top_srcdir)/m4/tempname.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ - $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \ - $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkat.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \ + $(top_srcdir)/m4/ttyname_r.m4 $(top_srcdir)/m4/unistd-safer.m4 \ + $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ + $(top_srcdir)/m4/unlinkat.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/unlockpt.m4 \ $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utimens.m4 \ $(top_srcdir)/m4/utimensat.m4 $(top_srcdir)/m4/utimes.m4 \ $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ @@ -248,6 +284,23 @@ am__can_run_installinfo = \ *) (install-info --version) >/dev/null 2>&1;; \ esac HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -818,6 +871,7 @@ LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@ LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ LIB_ACL = @LIB_ACL@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_EACCESS = @LIB_EACCESS@ LIB_SELINUX = @LIB_SELINUX@ LIB_SETSOCKOPT = @LIB_SETSOCKOPT@ LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ @@ -933,11 +987,13 @@ REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ +REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ +REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ @@ -946,6 +1002,7 @@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ REPLACE_LOCALECONV = @REPLACE_LOCALECONV@ +REPLACE_LOCALTIME = @REPLACE_LOCALTIME@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ REPLACE_LSTAT = @REPLACE_LSTAT@ @@ -1012,6 +1069,7 @@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOD = @REPLACE_STRTOD@ REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ +REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ @@ -1039,6 +1097,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ RSH = @RSH@ +SED = @SED@ SELINUX_CONTEXT_H = @SELINUX_CONTEXT_H@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -1076,6 +1135,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -1120,6 +1180,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1192,6 +1253,7 @@ $(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) + libtar.a: $(libtar_a_OBJECTS) $(libtar_a_DEPENDENCIES) $(EXTRA_libtar_a_DEPENDENCIES) $(AM_V_at)-rm -f libtar.a $(AM_V_AR)$(libtar_a_AR) libtar.a $(libtar_a_OBJECTS) $(libtar_a_LIBADD) @@ -1217,35 +1279,24 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1257,15 +1308,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1274,9 +1321,10 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -1432,8 +1480,8 @@ uninstall-am: .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-noinstLIBRARIES cscopelist ctags distclean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \ distclean-compile distclean-generic distclean-tags distdir dvi \ dvi-am html html-am info info-am install install-am \ install-data install-data-am install-dvi install-dvi-am \ @@ -1442,7 +1490,7 @@ uninstall-am: install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am rmt-command.h : Makefile diff --git a/lib/attr-xattr.in.h b/lib/attr-xattr.in.h index 7ec410b..845ee88 100644 --- a/lib/attr-xattr.in.h +++ b/lib/attr-xattr.in.h @@ -1,5 +1,5 @@ /* Replacement for platforms that lack it. - Copyright 2012-2013 Free Software Foundation, Inc. + Copyright 2012-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/paxerror.c b/lib/paxerror.c index 56903a3..134cef3 100644 --- a/lib/paxerror.c +++ b/lib/paxerror.c @@ -21,6 +21,8 @@ #include #include +void (*error_hook) (void); + /* Decode MODE from its binary form in a stat structure, and encode it into a 9-byte string STRING, terminated with a NUL. */ diff --git a/lib/paxlib.h b/lib/paxlib.h index d0ba45b..d4251d1 100644 --- a/lib/paxlib.h +++ b/lib/paxlib.h @@ -32,6 +32,8 @@ #define PAXEXIT_DIFFERS 1 #define PAXEXIT_FAILURE 2 +extern void (*error_hook) (void); + /* Both WARN and ERROR write a message on stderr and continue processing, however ERROR manages so tar will exit unsuccessfully. FATAL_ERROR writes a message on stderr and aborts immediately, with another message @@ -41,13 +43,31 @@ is zero when the error is not being detected by the system. */ #define WARN(Args) \ - error Args + do { if (error_hook) error_hook (); error Args; } while (0) #define ERROR(Args) \ - (error Args, exit_status = PAXEXIT_FAILURE) + do \ + { \ + if (error_hook) error_hook (); \ + error Args; \ + exit_status = PAXEXIT_FAILURE; \ + } \ + while (0) #define FATAL_ERROR(Args) \ - (error Args, fatal_exit ()) + do \ + { \ + if (error_hook) error_hook (); \ + error Args; \ + fatal_exit (); \ + } \ + while (0) #define USAGE_ERROR(Args) \ - (error Args, usage (PAXEXIT_FAILURE)) + do \ + { \ + if (error_hook) error_hook (); \ + error Args; \ + usage (PAXEXIT_FAILURE); \ + } \ + while (0) extern int exit_status; diff --git a/lib/prepargs.c b/lib/prepargs.c index 9b30d24..0c85bd4 100644 --- a/lib/prepargs.c +++ b/lib/prepargs.c @@ -1,5 +1,5 @@ /* Parse arguments from a string and prepend them to an argv. - Copyright 1999-2001, 2007, 2013 Free Software Foundation, Inc. + Copyright 1999-2001, 2007, 2013-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,16 +29,6 @@ #include -/* IN_CTYPE_DOMAIN (C) is nonzero if the unsigned char C can safely be given - as an argument to macros like "isspace". */ -#ifdef STDC_HEADERS -# define IN_CTYPE_DOMAIN(c) 1 -#else -# define IN_CTYPE_DOMAIN(c) ((c) <= 0177) -#endif - -#define ISSPACE(c) (IN_CTYPE_DOMAIN (c) && isspace (c)) - /* Find the white-space-separated options specified by OPTIONS, and using BUF to store copies of these options, set ARGV[0], ARGV[1], etc. to the option copies. Return the number N of options found. @@ -53,7 +43,7 @@ prepend_args (char const *options, char *buf, char **argv) for (;;) { - while (ISSPACE ((unsigned char) *o)) + while (isspace ((unsigned char) *o)) o++; if (!*o) return n; @@ -64,7 +54,7 @@ prepend_args (char const *options, char *buf, char **argv) do if ((*b++ = *o++) == '\\' && *o) b[-1] = *o++; - while (*o && ! ISSPACE ((unsigned char) *o)); + while (*o && ! isspace ((unsigned char) *o)); *b++ = '\0'; } diff --git a/lib/stdopen.c b/lib/stdopen.c index bdffca3..71bdae4 100644 --- a/lib/stdopen.c +++ b/lib/stdopen.c @@ -1,6 +1,6 @@ /* stdopen.c - ensure that the three standard file descriptors are in use - Copyright 2005, 2007, 2013 Free Software Foundation, Inc. + Copyright 2005, 2007, 2013-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/system.h b/lib/system.h index ef46267..e7f531c 100644 --- a/lib/system.h +++ b/lib/system.h @@ -389,9 +389,16 @@ extern int errno; # define ST_NBLOCKSIZE 512 #endif +/* Network Appliance file systems store small files directly in the + inode if st_size <= 64; in this case the number of blocks can be + zero. Perhaps other file systems have similar problems; so, + somewhat arbitrarily, do not consider a file to be sparse if + it has no blocks but st_size < ST_NBLOCKSIZE. */ #define ST_IS_SPARSE(st) \ (ST_NBLOCKS (st) \ - < ((st).st_size / ST_NBLOCKSIZE + ((st).st_size % ST_NBLOCKSIZE != 0))) + < ((st).st_size / ST_NBLOCKSIZE \ + + ((st).st_size % ST_NBLOCKSIZE != 0 \ + && (st).st_size / ST_NBLOCKSIZE != 0))) /* Declare standard functions. */ diff --git a/lib/wordsplit.c b/lib/wordsplit.c index 75faf9e..21807cd 100644 --- a/lib/wordsplit.c +++ b/lib/wordsplit.c @@ -1,5 +1,5 @@ /* wordsplit - a word splitter - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/lib/wordsplit.h b/lib/wordsplit.h index b48e3cd..d64cf2f 100644 --- a/lib/wordsplit.h +++ b/lib/wordsplit.h @@ -1,5 +1,5 @@ /* wordsplit - a word splitter - Copyright (C) 2009-2013 Free Software Foundation, Inc. + Copyright (C) 2009-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/lib/xattr-at.c b/lib/xattr-at.c index 3703e1c..443ccae 100644 --- a/lib/xattr-at.c +++ b/lib/xattr-at.c @@ -1,7 +1,7 @@ /* openat-style fd-relative functions for operating with extended file attributes. - Copyright 2012-2013 Free Software Foundation, Inc. + Copyright 2012-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/lib/xattr-at.h b/lib/xattr-at.h index 2981771..3c6eb72 100644 --- a/lib/xattr-at.h +++ b/lib/xattr-at.h @@ -1,7 +1,7 @@ /* Prototypes for openat-style fd-relative functions for operating with extended file attributes. - Copyright 2012-2013 Free Software Foundation, Inc. + Copyright 2012-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,7 +20,15 @@ #define XATTRS_AT_H #include -#include +#if defined(HAVE_SYS_XATTR_H) +# include +#elif defined(HAVE_ATTR_XATTR_H) +# include +#endif + +#ifndef ENOATTR +# define ENOATTR ENODATA /* No such attribute */ +#endif /* These are the dir-fd-relative variants of the functions without the "at" suffix. For example, setxattrat (AT_FDCWD, path, name, value, size, diff --git a/m4/00gnulib.m4 b/m4/00gnulib.m4 index d4ad759..8eca551 100644 --- a/m4/00gnulib.m4 +++ b/m4/00gnulib.m4 @@ -1,12 +1,28 @@ -# 00gnulib.m4 serial 2 -dnl Copyright (C) 2009-2013 Free Software Foundation, Inc. +# 00gnulib.m4 serial 3 +dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl This file must be named something that sorts before all other dnl gnulib-provided .m4 files. It is needed until such time as we can -dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE semantics. +dnl assume Autoconf 2.64, with its improved AC_DEFUN_ONCE and +dnl m4_divert semantics. + +# Until autoconf 2.63, handling of the diversion stack required m4_init +# to be called first; but this does not happen with aclocal. Wrapping +# the entire execution in another layer of the diversion stack fixes this. +# Worse, prior to autoconf 2.62, m4_wrap depended on the underlying m4 +# for whether it was FIFO or LIFO; in order to properly balance with +# m4_init, we need to undo our push just before anything wrapped within +# the m4_init body. The way to ensure this is to wrap both sides of +# m4_init with a one-shot macro that does the pop at the right time. +m4_ifndef([_m4_divert_diversion], +[m4_divert_push([KILL]) +m4_define([gl_divert_fixup], [m4_divert_pop()m4_define([$0])]) +m4_define([m4_init], + [gl_divert_fixup()]m4_defn([m4_init])[gl_divert_fixup()])]) + # AC_DEFUN_ONCE([NAME], VALUE) # ---------------------------- diff --git a/m4/absolute-header.m4 b/m4/absolute-header.m4 new file mode 100644 index 0000000..ce3e39e --- /dev/null +++ b/m4/absolute-header.m4 @@ -0,0 +1,102 @@ +# absolute-header.m4 serial 16 +dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Derek Price. + +# gl_ABSOLUTE_HEADER(HEADER1 HEADER2 ...) +# --------------------------------------- +# Find the absolute name of a header file, testing first if the header exists. +# If the header were sys/inttypes.h, this macro would define +# ABSOLUTE_SYS_INTTYPES_H to the '""' quoted absolute name of sys/inttypes.h +# in config.h +# (e.g. '#define ABSOLUTE_SYS_INTTYPES_H "///usr/include/sys/inttypes.h"'). +# The three "///" are to pacify Sun C 5.8, which otherwise would say +# "warning: #include of /usr/include/... may be non-portable". +# Use '""', not '<>', so that the /// cannot be confused with a C99 comment. +# Note: This macro assumes that the header file is not empty after +# preprocessing, i.e. it does not only define preprocessor macros but also +# provides some type/enum definitions or function/variable declarations. +AC_DEFUN([gl_ABSOLUTE_HEADER], +[AC_REQUIRE([AC_CANONICAL_HOST]) +AC_LANG_PREPROC_REQUIRE()dnl +dnl FIXME: gl_absolute_header and ac_header_exists must be used unquoted +dnl until we can assume autoconf 2.64 or newer. +m4_foreach_w([gl_HEADER_NAME], [$1], + [AS_VAR_PUSHDEF([gl_absolute_header], + [gl_cv_absolute_]m4_defn([gl_HEADER_NAME]))dnl + AC_CACHE_CHECK([absolute name of <]m4_defn([gl_HEADER_NAME])[>], + m4_defn([gl_absolute_header]), + [AS_VAR_PUSHDEF([ac_header_exists], + [ac_cv_header_]m4_defn([gl_HEADER_NAME]))dnl + AC_CHECK_HEADERS_ONCE(m4_defn([gl_HEADER_NAME]))dnl + if test AS_VAR_GET(ac_header_exists) = yes; then + gl_ABSOLUTE_HEADER_ONE(m4_defn([gl_HEADER_NAME])) + fi + AS_VAR_POPDEF([ac_header_exists])dnl + ])dnl + AC_DEFINE_UNQUOTED(AS_TR_CPP([ABSOLUTE_]m4_defn([gl_HEADER_NAME])), + ["AS_VAR_GET(gl_absolute_header)"], + [Define this to an absolute name of <]m4_defn([gl_HEADER_NAME])[>.]) + AS_VAR_POPDEF([gl_absolute_header])dnl +])dnl +])# gl_ABSOLUTE_HEADER + +# gl_ABSOLUTE_HEADER_ONE(HEADER) +# ------------------------------ +# Like gl_ABSOLUTE_HEADER, except that: +# - it assumes that the header exists, +# - it uses the current CPPFLAGS, +# - it does not cache the result, +# - it is silent. +AC_DEFUN([gl_ABSOLUTE_HEADER_ONE], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_LANG_CONFTEST([AC_LANG_SOURCE([[#include <]]m4_dquote([$1])[[>]])]) + dnl AIX "xlc -E" and "cc -E" omit #line directives for header files + dnl that contain only a #include of other header files and no + dnl non-comment tokens of their own. This leads to a failure to + dnl detect the absolute name of , , + dnl and others. The workaround is to force preservation of comments + dnl through option -C. This ensures all necessary #line directives + dnl are present. GCC supports option -C as well. + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac +changequote(,) + case "$host_os" in + mingw*) + dnl For the sake of native Windows compilers (excluding gcc), + dnl treat backslash as a directory separator, like /. + dnl Actually, these compilers use a double-backslash as + dnl directory separator, inside the + dnl # line "filename" + dnl directives. + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + dnl A sed expression that turns a string into a basic regular + dnl expression, for use within "/.../". + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo '$1' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' +changequote([,]) + dnl eval is necessary to expand gl_absname_cpp. + dnl Ultrix and Pyramid sh refuse to redirect output of eval, + dnl so use subshell. + AS_VAR_SET([gl_cv_absolute_]AS_TR_SH([[$1]]), +[`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | + sed -n "$gl_absolute_header_sed"`]) +]) diff --git a/m4/acl.m4 b/m4/acl.m4 index 5b1fb65..f02f69d 100644 --- a/m4/acl.m4 +++ b/m4/acl.m4 @@ -1,7 +1,7 @@ # acl.m4 - check for access control list (ACL) primitives -# serial 15 +# serial 17 -# Copyright (C) 2002, 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2002, 2004-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,6 +14,7 @@ AC_DEFUN([gl_FUNC_ACL], AS_HELP_STRING([--disable-acl], [do not support ACLs]), , [enable_acl=auto]) + AC_CHECK_FUNCS_ONCE([fchmod]) LIB_ACL= use_acl=0 if test "x$enable_acl" != "xno"; then @@ -141,12 +142,14 @@ int type = ACL_TYPE_EXTENDED;]])], # ------------------------------------- # If 'acl_get_file' works (does not have a particular bug), # run IF-WORKS, otherwise, IF-NOT. -# This tests for a Darwin 8.7.0 bug, whereby acl_get_file returns NULL, -# but sets errno = ENOENT for an existing file or directory. +# When building natively, test for a Darwin 8.7.0 bug, whereby acl_get_file +# returns NULL, but sets errno = ENOENT for an existing file or directory. +# When cross-compiling, assume that this old bug no longer applies. AC_DEFUN([gl_ACL_GET_FILE], [ AC_CACHE_CHECK([for working acl_get_file], [gl_cv_func_working_acl_get_file], - [AC_RUN_IFELSE( + [gl_cv_func_working_acl_get_file=no + AC_LINK_IFELSE( [AC_LANG_PROGRAM( [[#include #include @@ -156,9 +159,10 @@ AC_DEFUN([gl_ACL_GET_FILE], return 1; return 0; ]])], - [gl_cv_func_working_acl_get_file=yes], - [gl_cv_func_working_acl_get_file=no], - [gl_cv_func_working_acl_get_file=cross-compiling])]) - - AS_IF([test $gl_cv_func_working_acl_get_file = yes], [$1], [$2]) + [if test $cross_compiling = yes; then + gl_cv_func_working_acl_get_file="guessing yes" + elif ./conftest$ac_exeext; then + gl_cv_func_working_acl_get_file=yes + fi])]) + AS_IF([test "$gl_cv_func_working_acl_get_file" != no], [$1], [$2]) ]) diff --git a/m4/alloca.m4 b/m4/alloca.m4 index 270abd0..d7bdea6 100644 --- a/m4/alloca.m4 +++ b/m4/alloca.m4 @@ -1,5 +1,5 @@ # alloca.m4 serial 14 -dnl Copyright (C) 2002-2004, 2006-2007, 2009-2013 Free Software Foundation, +dnl Copyright (C) 2002-2004, 2006-2007, 2009-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/argp.m4 b/m4/argp.m4 index 4445d8e..723a7e6 100644 --- a/m4/argp.m4 +++ b/m4/argp.m4 @@ -1,5 +1,5 @@ # argp.m4 serial 14 -dnl Copyright (C) 2003-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/backupfile.m4 b/m4/backupfile.m4 index 019665a..6924944 100644 --- a/m4/backupfile.m4 +++ b/m4/backupfile.m4 @@ -1,5 +1,5 @@ # backupfile.m4 serial 14 -dnl Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/bison.m4 b/m4/bison.m4 index 3b1297a..c003367 100644 --- a/m4/bison.m4 +++ b/m4/bison.m4 @@ -1,6 +1,6 @@ # serial 7 -# Copyright (C) 2002, 2005, 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2002, 2005, 2009-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/btowc.m4 b/m4/btowc.m4 index 978a06e..9988944 100644 --- a/m4/btowc.m4 +++ b/m4/btowc.m4 @@ -1,5 +1,5 @@ # btowc.m4 serial 10 -dnl Copyright (C) 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4 index cef3124..ace4556 100644 --- a/m4/canonicalize.m4 +++ b/m4/canonicalize.m4 @@ -1,6 +1,6 @@ # canonicalize.m4 serial 26 -dnl Copyright (C) 2003-2007, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2007, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/chdir-long.m4 b/m4/chdir-long.m4 index 9c498a6..8ed436d 100644 --- a/m4/chdir-long.m4 +++ b/m4/chdir-long.m4 @@ -6,7 +6,7 @@ # never fails with ENAMETOOLONG. # Arrange to compile chdir-long.c only on systems that define PATH_MAX. -dnl Copyright (C) 2004-2007, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2007, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/chown.m4 b/m4/chown.m4 index e5c084d..2f7b6d7 100644 --- a/m4/chown.m4 +++ b/m4/chown.m4 @@ -1,7 +1,7 @@ # serial 27 # Determine whether we need the chown wrapper. -dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009-2013 Free Software +dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009-2014 Free Software dnl Foundation, Inc. dnl This file is free software; the Free Software Foundation diff --git a/m4/clock_time.m4 b/m4/clock_time.m4 index 6597fb6..6c4a637 100644 --- a/m4/clock_time.m4 +++ b/m4/clock_time.m4 @@ -1,5 +1,5 @@ # clock_time.m4 serial 10 -dnl Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/close-stream.m4 b/m4/close-stream.m4 index 0a80c37..80cde85 100644 --- a/m4/close-stream.m4 +++ b/m4/close-stream.m4 @@ -1,5 +1,5 @@ #serial 4 -dnl Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/close.m4 b/m4/close.m4 index bccd981..68510c5 100644 --- a/m4/close.m4 +++ b/m4/close.m4 @@ -1,5 +1,5 @@ # close.m4 serial 8 -dnl Copyright (C) 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/closedir.m4 b/m4/closedir.m4 index bb8708b..d234a52 100644 --- a/m4/closedir.m4 +++ b/m4/closedir.m4 @@ -1,5 +1,5 @@ # closedir.m4 serial 2 -dnl Copyright (C) 2011-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/closeout.m4 b/m4/closeout.m4 index 759feaa..2f0c87e 100644 --- a/m4/closeout.m4 +++ b/m4/closeout.m4 @@ -1,5 +1,5 @@ # closeout.m4 serial 6 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/codeset.m4 b/m4/codeset.m4 index c2761be..d7de8d6 100644 --- a/m4/codeset.m4 +++ b/m4/codeset.m4 @@ -1,5 +1,5 @@ # codeset.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2000-2002, 2006, 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2000-2002, 2006, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/configmake.m4 b/m4/configmake.m4 index 823ffc0..0cd86cf 100644 --- a/m4/configmake.m4 +++ b/m4/configmake.m4 @@ -1,5 +1,5 @@ -# configmake.m4 serial 1 -dnl Copyright (C) 2010-2013 Free Software Foundation, Inc. +# configmake.m4 serial 2 +dnl Copyright (C) 2010-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -7,8 +7,9 @@ dnl with or without modifications, as long as this notice is preserved. # gl_CONFIGMAKE_PREP # ------------------ # Guarantee all of the standard directory variables, even when used with -# autoconf 2.59 (datarootdir wasn't supported until 2.59c) or automake -# 1.9.6 (pkglibexecdir wasn't supported until 1.10b.). +# autoconf 2.59 (datarootdir wasn't supported until 2.59c, and runstatedir +# in 2.70) or automake 1.9.6 (pkglibexecdir wasn't supported until 1.10b, +# and runstatedir in 1.14.1). AC_DEFUN([gl_CONFIGMAKE_PREP], [ dnl Technically, datadir should default to datarootdir. But if @@ -43,6 +44,10 @@ AC_DEFUN([gl_CONFIGMAKE_PREP], if test "x$localedir" = x; then AC_SUBST([localedir], ['${datarootdir}/locale']) fi + dnl Added in autoconf 2.70 + if test "x$runstatedir" = x; then + AC_SUBST([runstatedir], ['${localstatedir}/run']) + fi dnl Automake 1.9.6 only lacks pkglibexecdir; and since 1.11 merely dnl provides it without AC_SUBST, this blind use of AC_SUBST is safe. diff --git a/m4/d-ino.m4 b/m4/d-ino.m4 index aab82c2..5ccb733 100644 --- a/m4/d-ino.m4 +++ b/m4/d-ino.m4 @@ -1,11 +1,11 @@ -# serial 13 +# serial 14 dnl From Jim Meyering. dnl dnl Check whether struct dirent has a member named d_ino. dnl -# Copyright (C) 1997, 1999-2001, 2003-2004, 2006-2007, 2009-2013 Free Software +# Copyright (C) 1997, 1999-2001, 2003-2004, 2006-2007, 2009-2014 Free Software # Foundation, Inc. # This file is free software; the Free Software Foundation @@ -30,7 +30,7 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO], e = readdir (dp); if (! e) return 2; - if (stat (e->d_name, &st) != 0) + if (lstat (e->d_name, &st) != 0) return 3; if (e->d_ino != st.st_ino) return 4; diff --git a/m4/dirent-safer.m4 b/m4/dirent-safer.m4 index 708d7b1..0a197fb 100644 --- a/m4/dirent-safer.m4 +++ b/m4/dirent-safer.m4 @@ -1,5 +1,5 @@ #serial 2 -dnl Copyright (C) 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/dirent_h.m4 b/m4/dirent_h.m4 index 54c1663..3f2b16b 100644 --- a/m4/dirent_h.m4 +++ b/m4/dirent_h.m4 @@ -1,5 +1,5 @@ # dirent_h.m4 serial 16 -dnl Copyright (C) 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/dirfd.m4 b/m4/dirfd.m4 index 39bc789..b422769 100644 --- a/m4/dirfd.m4 +++ b/m4/dirfd.m4 @@ -2,7 +2,7 @@ dnl Find out how to get the file descriptor associated with an open DIR*. -# Copyright (C) 2001-2006, 2008-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2006, 2008-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/dirname.m4 b/m4/dirname.m4 index 5897a2a..d2627b8 100644 --- a/m4/dirname.m4 +++ b/m4/dirname.m4 @@ -1,5 +1,5 @@ #serial 10 -*- autoconf -*- -dnl Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/double-slash-root.m4 b/m4/double-slash-root.m4 index bd6f867..937f4bc 100644 --- a/m4/double-slash-root.m4 +++ b/m4/double-slash-root.m4 @@ -1,5 +1,5 @@ # double-slash-root.m4 serial 4 -*- Autoconf -*- -dnl Copyright (C) 2006, 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/dup.m4 b/m4/dup.m4 index 5105b6e..9393bc5 100644 --- a/m4/dup.m4 +++ b/m4/dup.m4 @@ -1,5 +1,5 @@ # dup.m4 serial 3 -dnl Copyright (C) 2011-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/dup2.m4 b/m4/dup2.m4 index 269cfdc..89638a0 100644 --- a/m4/dup2.m4 +++ b/m4/dup2.m4 @@ -1,5 +1,5 @@ -#serial 19 -dnl Copyright (C) 2002, 2005, 2007, 2009-2013 Free Software Foundation, Inc. +#serial 20 +dnl Copyright (C) 2002, 2005, 2007, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -39,9 +39,11 @@ AC_DEFUN([gl_FUNC_DUP2], /* Many gnulib modules require POSIX conformance of EBADF. */ if (dup2 (2, 1000000) == -1 && errno != EBADF) result |= 16; - /* Flush out a cygwin core dump. */ + /* Flush out some cygwin core dumps. */ if (dup2 (2, -1) != -1 || errno != EBADF) result |= 32; + dup2 (2, 255); + dup2 (2, 256); return result; ]) ], @@ -65,6 +67,7 @@ AC_DEFUN([gl_FUNC_DUP2], *yes) ;; *) REPLACE_DUP2=1 + AC_CHECK_FUNCS([setdtablesize]) ;; esac fi diff --git a/m4/eealloc.m4 b/m4/eealloc.m4 index c640ec1..8a51fe7 100644 --- a/m4/eealloc.m4 +++ b/m4/eealloc.m4 @@ -1,5 +1,5 @@ # eealloc.m4 serial 3 -dnl Copyright (C) 2003, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/environ.m4 b/m4/environ.m4 index 593a33e..cfabe46 100644 --- a/m4/environ.m4 +++ b/m4/environ.m4 @@ -1,5 +1,5 @@ # environ.m4 serial 6 -dnl Copyright (C) 2001-2004, 2006-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/errno_h.m4 b/m4/errno_h.m4 index c813ea5..4ee9e6a 100644 --- a/m4/errno_h.m4 +++ b/m4/errno_h.m4 @@ -1,5 +1,5 @@ # errno_h.m4 serial 12 -dnl Copyright (C) 2004, 2006, 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2004, 2006, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/error.m4 b/m4/error.m4 index 29e6fdc..f08ae50 100644 --- a/m4/error.m4 +++ b/m4/error.m4 @@ -1,6 +1,6 @@ #serial 14 -# Copyright (C) 1996-1998, 2001-2004, 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-1998, 2001-2004, 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/euidaccess.m4 b/m4/euidaccess.m4 new file mode 100644 index 0000000..55393a4 --- /dev/null +++ b/m4/euidaccess.m4 @@ -0,0 +1,52 @@ +# euidaccess.m4 serial 15 +dnl Copyright (C) 2002-2014 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_FUNC_NONREENTRANT_EUIDACCESS], +[ + AC_REQUIRE([gl_FUNC_EUIDACCESS]) + AC_CHECK_DECLS([setregid]) + AC_DEFINE([PREFER_NONREENTRANT_EUIDACCESS], [1], + [Define this if you prefer euidaccess to return the correct result + even if this would make it nonreentrant. Define this only if your + entire application is safe even if the uid or gid might temporarily + change. If your application uses signal handlers or threads it + is probably not safe.]) +]) + +AC_DEFUN([gl_FUNC_EUIDACCESS], +[ + AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + + dnl Persuade glibc to declare euidaccess(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + + AC_CHECK_FUNCS([euidaccess]) + if test $ac_cv_func_euidaccess = no; then + HAVE_EUIDACCESS=0 + fi +]) + +# Prerequisites of lib/euidaccess.c. +AC_DEFUN([gl_PREREQ_EUIDACCESS], [ + dnl Prefer POSIX faccessat over non-standard euidaccess. + AC_CHECK_FUNCS_ONCE([faccessat]) + dnl Try various other non-standard fallbacks. + AC_CHECK_HEADERS([libgen.h]) + AC_FUNC_GETGROUPS + + # Solaris 9 and 10 need -lgen to get the eaccess function. + # Save and restore LIBS so -lgen isn't added to it. Otherwise, *all* + # programs in the package would end up linked with that potentially-shared + # library, inducing unnecessary run-time overhead. + LIB_EACCESS= + AC_SUBST([LIB_EACCESS]) + gl_saved_libs=$LIBS + AC_SEARCH_LIBS([eaccess], [gen], + [test "$ac_cv_search_eaccess" = "none required" || + LIB_EACCESS=$ac_cv_search_eaccess]) + AC_CHECK_FUNCS([eaccess]) + LIBS=$gl_saved_libs +]) diff --git a/m4/exponentd.m4 b/m4/exponentd.m4 index 09df468..7bee635 100644 --- a/m4/exponentd.m4 +++ b/m4/exponentd.m4 @@ -1,5 +1,5 @@ # exponentd.m4 serial 3 -dnl Copyright (C) 2007-2008, 2010-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2008, 2010-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/extensions.m4 b/m4/extensions.m4 index e30f122..37f55ca 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-2013 Free Software Foundation, Inc. +# Copyright (C) 2003, 2006-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4 index c4c5e7f..240150e 100644 --- a/m4/extern-inline.m4 +++ b/m4/extern-inline.m4 @@ -1,6 +1,6 @@ dnl 'extern inline' a la ISO C99. -dnl Copyright 2012-2013 Free Software Foundation, Inc. +dnl Copyright 2012-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -19,27 +19,41 @@ 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 Apple's platforms, as Libc at least - through Libc-825.26 (2013-04-09) is incompatible with it; see, e.g., + Suppress the use of extern inline on problematic Apple configurations. + OS X 10.8 and earlier mishandle it; see, e.g., . + 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__ \ + && (defined __header_inline \ + ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \ + && ! defined __clang__) \ + : ((! defined _DONT_USE_CTYPE_INLINE_ \ + && (defined __GNUC__ || defined __cplusplus)) \ + || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \ + && defined __GNUC__ && ! defined __cplusplus)))) +# define _GL_EXTERN_INLINE_APPLE_BUG +#endif #if ((__GNUC__ \ ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \ : (199901L <= __STDC_VERSION__ \ && !defined __HP_cc \ && !(defined __SUNPRO_C && __STDC__))) \ - && !defined __APPLE__) + && !defined _GL_EXTERN_INLINE_APPLE_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 __APPLE__) -# if __GNUC_GNU_INLINE__ + && !defined _GL_EXTERN_INLINE_APPLE_BUG) +# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__ /* __gnu_inline__ suppresses a GCC 4.2 diagnostic. */ # define _GL_INLINE extern inline __attribute__ ((__gnu_inline__)) # else # define _GL_INLINE extern inline # endif # define _GL_EXTERN_INLINE extern +# define _GL_EXTERN_INLINE_IN_USE #else # define _GL_INLINE static _GL_UNUSED # define _GL_EXTERN_INLINE static _GL_UNUSED diff --git a/m4/faccessat.m4 b/m4/faccessat.m4 new file mode 100644 index 0000000..d9016bd --- /dev/null +++ b/m4/faccessat.m4 @@ -0,0 +1,28 @@ +# serial 6 +# See if we need to provide faccessat replacement. + +dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +# Written by Eric Blake. + +AC_DEFUN([gl_FUNC_FACCESSAT], +[ + AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + + dnl Persuade glibc to declare faccessat(). + AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + + AC_CHECK_FUNCS_ONCE([faccessat]) + if test $ac_cv_func_faccessat = no; then + HAVE_FACCESSAT=0 + fi +]) + +# Prerequisites of lib/faccessat.m4. +AC_DEFUN([gl_PREREQ_FACCESSAT], +[ + AC_CHECK_FUNCS([access]) +]) diff --git a/m4/fchdir.m4 b/m4/fchdir.m4 index c248fdc..9da16b0 100644 --- a/m4/fchdir.m4 +++ b/m4/fchdir.m4 @@ -1,5 +1,5 @@ # fchdir.m4 serial 21 -dnl Copyright (C) 2006-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fchmodat.m4 b/m4/fchmodat.m4 index dc9c4e7..28954c4 100644 --- a/m4/fchmodat.m4 +++ b/m4/fchmodat.m4 @@ -1,5 +1,5 @@ # fchmodat.m4 serial 1 -dnl Copyright (C) 2004-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fchownat.m4 b/m4/fchownat.m4 index 9c862d3..479b277 100644 --- a/m4/fchownat.m4 +++ b/m4/fchownat.m4 @@ -1,5 +1,5 @@ # fchownat.m4 serial 1 -dnl Copyright (C) 2004-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fcntl-o.m4 b/m4/fcntl-o.m4 index 87cc4bd..43c9312 100644 --- a/m4/fcntl-o.m4 +++ b/m4/fcntl-o.m4 @@ -1,5 +1,5 @@ # fcntl-o.m4 serial 4 -dnl Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fcntl.m4 b/m4/fcntl.m4 index 5481cae..4a2771f 100644 --- a/m4/fcntl.m4 +++ b/m4/fcntl.m4 @@ -1,5 +1,5 @@ # fcntl.m4 serial 5 -dnl Copyright (C) 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fcntl_h.m4 b/m4/fcntl_h.m4 index 3cff1fd..fb2556d 100644 --- a/m4/fcntl_h.m4 +++ b/m4/fcntl_h.m4 @@ -1,6 +1,6 @@ # serial 15 # Configure fcntl.h. -dnl Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fdopendir.m4 b/m4/fdopendir.m4 index b7be783..a3e7849 100644 --- a/m4/fdopendir.m4 +++ b/m4/fdopendir.m4 @@ -1,7 +1,7 @@ # serial 10 # See if we need to provide fdopendir. -dnl Copyright (C) 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fileblocks.m4 b/m4/fileblocks.m4 index d1abd30..2ec23e7 100644 --- a/m4/fileblocks.m4 +++ b/m4/fileblocks.m4 @@ -1,5 +1,5 @@ # fileblocks.m4 serial 6 -dnl Copyright (C) 2002, 2005-2006, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/filenamecat.m4 b/m4/filenamecat.m4 index 40946e8..6c6656a 100644 --- a/m4/filenamecat.m4 +++ b/m4/filenamecat.m4 @@ -1,5 +1,5 @@ # filenamecat.m4 serial 11 -dnl Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/float_h.m4 b/m4/float_h.m4 index 397f2d1..a27ef7f 100644 --- a/m4/float_h.m4 +++ b/m4/float_h.m4 @@ -1,5 +1,5 @@ # float_h.m4 serial 9 -dnl Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4 index fa0ba4d..9db4144 100644 --- a/m4/fnmatch.m4 +++ b/m4/fnmatch.m4 @@ -1,6 +1,6 @@ # Check for fnmatch - serial 9. -# Copyright (C) 2000-2007, 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2000-2007, 2009-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/fpending.m4 b/m4/fpending.m4 index 8f58562..c2d01ef 100644 --- a/m4/fpending.m4 +++ b/m4/fpending.m4 @@ -1,6 +1,6 @@ -# serial 19 +# serial 21 -# Copyright (C) 2000-2001, 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2004-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,14 +16,23 @@ dnl we have to grub around in the FILE struct. AC_DEFUN([gl_FUNC_FPENDING], [ AC_CHECK_HEADERS_ONCE([stdio_ext.h]) - AC_CHECK_FUNCS_ONCE([__fpending]) fp_headers=' -# include -# if HAVE_STDIO_EXT_H -# include -# endif -' - AC_CHECK_DECLS([__fpending], , , $fp_headers) + #include + #if HAVE_STDIO_EXT_H + # include + #endif + ' + AC_CACHE_CHECK([for __fpending], [gl_cv_func___fpending], + [ + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([$fp_headers], + [[return ! __fpending (stdin);]])], + [gl_cv_func___fpending=yes], + [gl_cv_func___fpending=no]) + ]) + if test $gl_cv_func___fpending = yes; then + AC_CHECK_DECLS([__fpending], [], [], [$fp_headers]) + fi ]) AC_DEFUN([gl_PREREQ_FPENDING], diff --git a/m4/fseek.m4 b/m4/fseek.m4 index 74f6656..a5ea41d 100644 --- a/m4/fseek.m4 +++ b/m4/fseek.m4 @@ -1,5 +1,5 @@ # fseek.m4 serial 4 -dnl Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fseeko.m4 b/m4/fseeko.m4 index ca9da28..4ccb57d 100644 --- a/m4/fseeko.m4 +++ b/m4/fseeko.m4 @@ -1,5 +1,5 @@ # fseeko.m4 serial 17 -dnl Copyright (C) 2007-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fstat.m4 b/m4/fstat.m4 index b2cf2ad..ddd3fb9 100644 --- a/m4/fstat.m4 +++ b/m4/fstat.m4 @@ -1,5 +1,5 @@ # fstat.m4 serial 4 -dnl Copyright (C) 2011-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/fstatat.m4 b/m4/fstatat.m4 index adbc7e5..548eb7b 100644 --- a/m4/fstatat.m4 +++ b/m4/fstatat.m4 @@ -1,5 +1,5 @@ # fstatat.m4 serial 3 -dnl Copyright (C) 2004-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/futimens.m4 b/m4/futimens.m4 index a159207..3979813 100644 --- a/m4/futimens.m4 +++ b/m4/futimens.m4 @@ -1,7 +1,7 @@ # serial 6 # See if we need to provide futimens replacement. -dnl Copyright (C) 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/getcwd-abort-bug.m4 b/m4/getcwd-abort-bug.m4 index 9b3b563..de69622 100644 --- a/m4/getcwd-abort-bug.m4 +++ b/m4/getcwd-abort-bug.m4 @@ -3,7 +3,7 @@ # name is unusually large. Any length between 4k and 16k trigger the bug # when using glibc-2.4.90-9 or older. -# Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -27,6 +27,7 @@ AC_DEFUN([gl_FUNC_GETCWD_ABORT_BUG], AC_RUN_IFELSE( [AC_LANG_SOURCE( [[ +#include #include #if HAVE_UNISTD_H # include diff --git a/m4/getcwd-path-max.m4 b/m4/getcwd-path-max.m4 index 0b03b66..6b49f1a 100644 --- a/m4/getcwd-path-max.m4 +++ b/m4/getcwd-path-max.m4 @@ -6,7 +6,7 @@ # I've heard that this is due to a Linux kernel bug, and that it has # been fixed between 2.4.21-pre3 and 2.4.21-pre4. -# Copyright (C) 2003-2007, 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2007, 2009-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/getcwd.m4 b/m4/getcwd.m4 index 6f91bd9..fc986cd 100644 --- a/m4/getcwd.m4 +++ b/m4/getcwd.m4 @@ -1,6 +1,6 @@ # getcwd.m4 - check for working getcwd that is compatible with glibc -# Copyright (C) 2001, 2003-2007, 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003-2007, 2009-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/getdelim.m4 b/m4/getdelim.m4 index 36f66a1..c763994 100644 --- a/m4/getdelim.m4 +++ b/m4/getdelim.m4 @@ -1,6 +1,6 @@ # getdelim.m4 serial 10 -dnl Copyright (C) 2005-2007, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc. dnl dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/getdtablesize.m4 b/m4/getdtablesize.m4 index 8f04b3b..aa523b6 100644 --- a/m4/getdtablesize.m4 +++ b/m4/getdtablesize.m4 @@ -1,5 +1,5 @@ -# getdtablesize.m4 serial 4 -dnl Copyright (C) 2008-2013 Free Software Foundation, Inc. +# getdtablesize.m4 serial 5 +dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -7,8 +7,35 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_GETDTABLESIZE], [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + AC_REQUIRE([AC_CANONICAL_HOST]) AC_CHECK_FUNCS_ONCE([getdtablesize]) - if test $ac_cv_func_getdtablesize != yes; then + if test $ac_cv_func_getdtablesize = yes; then + # Cygwin 1.7.25 automatically increases the RLIMIT_NOFILE soft limit + # up to an unchangeable hard limit; all other platforms correctly + # require setrlimit before getdtablesize() can report a larger value. + AC_CACHE_CHECK([whether getdtablesize works], + [gl_cv_func_getdtablesize_works], + [AC_RUN_IFELSE([ + AC_LANG_PROGRAM([[#include ]], + [int size = getdtablesize(); + if (dup2 (0, getdtablesize()) != -1) + return 1; + if (size != getdtablesize()) + return 2; + ])], + [gl_cv_func_getdtablesize_works=yes], + [gl_cv_func_getdtablesize_works=no], + [case "$host_os" in + cygwin*) # on cygwin 1.5.25, getdtablesize() automatically grows + gl_cv_func_getdtablesize_works="guessing no" ;; + *) gl_cv_func_getdtablesize_works="guessing yes" ;; + esac]) + ]) + case "$gl_cv_func_getdtablesize_works" in + *yes) ;; + *) REPLACE_GETDTABLESIZE=1 ;; + esac + else HAVE_GETDTABLESIZE=0 fi ]) diff --git a/m4/getgroups.m4 b/m4/getgroups.m4 new file mode 100644 index 0000000..f05357d --- /dev/null +++ b/m4/getgroups.m4 @@ -0,0 +1,107 @@ +# serial 18 + +dnl From Jim Meyering. +dnl A wrapper around AC_FUNC_GETGROUPS. + +# Copyright (C) 1996-1997, 1999-2004, 2008-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +m4_version_prereq([2.70], [] ,[ + +# This is taken from the following Autoconf patch: +# http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=7fbb553727ed7e0e689a17594b58559ecf3ea6e9 +AC_DEFUN([AC_FUNC_GETGROUPS], +[ + AC_REQUIRE([AC_TYPE_GETGROUPS])dnl + AC_REQUIRE([AC_TYPE_SIZE_T])dnl + AC_REQUIRE([AC_CANONICAL_HOST])dnl for cross-compiles + AC_CHECK_FUNC([getgroups]) + + # If we don't yet have getgroups, see if it's in -lbsd. + # This is reported to be necessary on an ITOS 3000WS running SEIUX 3.1. + ac_save_LIBS=$LIBS + if test $ac_cv_func_getgroups = no; then + AC_CHECK_LIB(bsd, getgroups, [GETGROUPS_LIB=-lbsd]) + fi + + # Run the program to test the functionality of the system-supplied + # getgroups function only if there is such a function. + if test $ac_cv_func_getgroups = yes; then + AC_CACHE_CHECK([for working getgroups], [ac_cv_func_getgroups_works], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [AC_INCLUDES_DEFAULT], + [[/* On Ultrix 4.3, getgroups (0, 0) always fails. */ + return getgroups (0, 0) == -1;]]) + ], + [ac_cv_func_getgroups_works=yes], + [ac_cv_func_getgroups_works=no], + [case "$host_os" in # (( + # Guess yes on glibc systems. + *-gnu*) ac_cv_func_getgroups_works="guessing yes" ;; + # If we don't know, assume the worst. + *) ac_cv_func_getgroups_works="guessing no" ;; + esac + ]) + ]) + else + ac_cv_func_getgroups_works=no + fi + case "$ac_cv_func_getgroups_works" in + *yes) + AC_DEFINE([HAVE_GETGROUPS], [1], + [Define to 1 if your system has a working `getgroups' function.]) + ;; + esac + LIBS=$ac_save_LIBS +])# AC_FUNC_GETGROUPS + +]) + +AC_DEFUN([gl_FUNC_GETGROUPS], +[ + AC_REQUIRE([AC_TYPE_GETGROUPS]) + AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + + AC_FUNC_GETGROUPS + if test $ac_cv_func_getgroups != yes; then + HAVE_GETGROUPS=0 + else + if test "$ac_cv_type_getgroups" != gid_t \ + || { case "$ac_cv_func_getgroups_works" in + *yes) false;; + *) true;; + esac + }; then + REPLACE_GETGROUPS=1 + AC_DEFINE([GETGROUPS_ZERO_BUG], [1], [Define this to 1 if + getgroups(0,NULL) does not return the number of groups.]) + else + dnl Detect FreeBSD bug; POSIX requires getgroups(-1,ptr) to fail. + AC_CACHE_CHECK([whether getgroups handles negative values], + [gl_cv_func_getgroups_works], + [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT], + [[int size = getgroups (0, 0); + gid_t *list = malloc (size * sizeof *list); + return getgroups (-1, list) != -1;]])], + [gl_cv_func_getgroups_works=yes], + [gl_cv_func_getgroups_works=no], + [case "$host_os" in + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_getgroups_works="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_getgroups_works="guessing no" ;; + esac + ])]) + case "$gl_cv_func_getgroups_works" in + *yes) ;; + *) REPLACE_GETGROUPS=1 ;; + esac + fi + fi + test -n "$GETGROUPS_LIB" && LIBS="$GETGROUPS_LIB $LIBS" +]) diff --git a/m4/getline.m4 b/m4/getline.m4 index 342bc99..0330666 100644 --- a/m4/getline.m4 +++ b/m4/getline.m4 @@ -1,6 +1,6 @@ # getline.m4 serial 26 -dnl Copyright (C) 1998-2003, 2005-2007, 2009-2013 Free Software Foundation, +dnl Copyright (C) 1998-2003, 2005-2007, 2009-2014 Free Software Foundation, dnl Inc. dnl dnl This file is free software; the Free Software Foundation diff --git a/m4/getopt.m4 b/m4/getopt.m4 index 50f4509..f127028 100644 --- a/m4/getopt.m4 +++ b/m4/getopt.m4 @@ -1,5 +1,5 @@ # getopt.m4 serial 44 -dnl Copyright (C) 2002-2006, 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/getpagesize.m4 b/m4/getpagesize.m4 index 06e893d..ce50695 100644 --- a/m4/getpagesize.m4 +++ b/m4/getpagesize.m4 @@ -1,5 +1,5 @@ # getpagesize.m4 serial 9 -dnl Copyright (C) 2002, 2004-2005, 2007, 2009-2013 Free Software Foundation, +dnl Copyright (C) 2002, 2004-2005, 2007, 2009-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/gettext.m4 b/m4/gettext.m4 index 2aaaf54..08e6b21 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -1,5 +1,5 @@ # gettext.m4 serial 66 (gettext-0.18.2) -dnl Copyright (C) 1995-2013 Free Software Foundation, Inc. +dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/gettime.m4 b/m4/gettime.m4 index dc100de..c5ec264 100644 --- a/m4/gettime.m4 +++ b/m4/gettime.m4 @@ -1,5 +1,5 @@ # gettime.m4 serial 8 -dnl Copyright (C) 2002, 2004-2006, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004-2006, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4 index 3c05e59..1c2d66e 100644 --- a/m4/gettimeofday.m4 +++ b/m4/gettimeofday.m4 @@ -1,6 +1,6 @@ -# serial 20 +# serial 21 -# Copyright (C) 2001-2003, 2005, 2007, 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2003, 2005, 2007, 2009-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -127,10 +127,8 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER], ]) AC_DEFUN([gl_GETTIMEOFDAY_REPLACE_LOCALTIME], [ - AC_DEFINE([gmtime], [rpl_gmtime], - [Define to rpl_gmtime if the replacement function should be used.]) - AC_DEFINE([localtime], [rpl_localtime], - [Define to rpl_localtime if the replacement function should be used.]) + REPLACE_GMTIME=1 + REPLACE_LOCALTIME=1 ]) # Prerequisites of lib/gettimeofday.c. diff --git a/m4/glibc21.m4 b/m4/glibc21.m4 index 613fb2a..ab58b71 100644 --- a/m4/glibc21.m4 +++ b/m4/glibc21.m4 @@ -1,5 +1,5 @@ # glibc21.m4 serial 5 -dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2013 Free Software Foundation, +dnl Copyright (C) 2000-2002, 2004, 2008, 2010-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index 0ae5a9e..20ce40e 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -1,5 +1,5 @@ -# gnulib-common.m4 serial 33 -dnl Copyright (C) 2007-2013 Free Software Foundation, Inc. +# gnulib-common.m4 serial 34 +dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -375,3 +375,63 @@ AC_DEFUN([gl_CACHE_VAL_SILENT], AC_CACHE_VAL([$1], [$2]) as_echo_n="$saved_as_echo_n" ]) + +# AS_VAR_COPY was added in autoconf 2.63b +m4_define_default([AS_VAR_COPY], +[AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])]) + +# AC_PROG_SED was added in autoconf 2.59b +m4_ifndef([AC_PROG_SED], +[AC_DEFUN([AC_PROG_SED], +[AC_CACHE_CHECK([for a sed that does not truncate output], ac_cv_path_SED, + [dnl ac_script should not contain more than 99 commands (for HP-UX sed), + dnl but more than about 7000 bytes, to catch a limit in Solaris 8 /usr/ucb/sed. + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + AS_UNSET([ac_script]) + if test -z "$SED"; then + ac_path_SED_found=false + _AS_PATH_WALK([], [ + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + AS_EXECUTABLE_P(["$ac_path_SED"]) || continue + case `"$ac_path_SED" --version 2>&1` in + *GNU*) ac_cv_path_SED=$ac_path_SED ac_path_SED_found=:;; + *) + ac_count=0 + _AS_ECHO_N([0123456789]) >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >> conftest.nl + "$ac_path_SED" -f conftest.sed conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best so far, but keep looking for better + ac_cv_path_SED=$ac_path_SED + ac_path_SED_max=$ac_count + fi + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; + esac + $ac_path_SED_found && break 3 + done + done]) + if test -z "$ac_cv_path_SED"; then + AC_ERROR([no acceptable sed could be found in \$PATH]) + fi + else + ac_cv_path_SED=$SED + fi + SED="$ac_cv_path_SED" + AC_SUBST([SED])dnl + rm -f conftest.sed +])])]) diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 21c05ad..6d82374 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -1,7 +1,7 @@ # -*- buffer-read-only: t -*- vi: set ro: # DO NOT EDIT! GENERATED AUTOMATICALLY! # DO NOT EDIT! GENERATED AUTOMATICALLY! -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -41,6 +41,7 @@ AC_DEFUN([gl_EARLY], m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable AC_REQUIRE([gl_PROG_AR_RANLIB]) AC_REQUIRE([AM_PROG_CC_C_O]) + # Code from module absolute-header: # Code from module acl: # Code from module alloca: # Code from module alloca-opt: @@ -82,11 +83,13 @@ AC_DEFUN([gl_EARLY], # Code from module environ: # Code from module errno: # Code from module error: + # Code from module euidaccess: # Code from module exclude: # Code from module exitfail: # Code from module extensions: AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) # Code from module extern-inline: + # Code from module faccessat: # Code from module fchdir: # Code from module fchmodat: # Code from module fchownat: @@ -102,6 +105,7 @@ AC_DEFUN([gl_EARLY], # Code from module fnmatch: # Code from module fnmatch-gnu: # Code from module fpending: + # Code from module fprintftime: # Code from module fseek: # Code from module fseeko: AC_REQUIRE([AC_FUNC_FSEEKO]) @@ -113,6 +117,7 @@ AC_DEFUN([gl_EARLY], # Code from module getcwd-lgpl: # Code from module getdelim: # Code from module getdtablesize: + # Code from module getgroups: # Code from module getline: # Code from module getopt-gnu: # Code from module getopt-posix: @@ -122,6 +127,7 @@ AC_DEFUN([gl_EARLY], # Code from module gettime: # Code from module gettimeofday: # Code from module gitlog-to-changelog: + # Code from module group-member: # Code from module hash: # Code from module havelib: # Code from module human: @@ -130,6 +136,7 @@ AC_DEFUN([gl_EARLY], # Code from module inttostr: # Code from module inttypes: # Code from module inttypes-incomplete: + # Code from module isatty: # Code from module iswblank: # Code from module langinfo: # Code from module largefile: @@ -178,8 +185,11 @@ AC_DEFUN([gl_EARLY], # Code from module opendir: # Code from module parse-datetime: # Code from module pathmax: + # Code from module posix_openpt: # Code from module priv-set: # Code from module progname: + # Code from module ptsname: + # Code from module ptsname_r: # Code from module qacl: # Code from module quote: # Code from module quotearg: @@ -240,12 +250,15 @@ AC_DEFUN([gl_EARLY], # Code from module streq: # Code from module strerror: # Code from module strerror-override: + # Code from module strftime: # Code from module string: # Code from module strings: # Code from module strndup: # Code from module strnlen: # Code from module strnlen1: + # Code from module strtoimax: # Code from module strtol: + # Code from module strtoll: # Code from module strtoul: # Code from module strtoull: # Code from module strtoumax: @@ -259,6 +272,7 @@ AC_DEFUN([gl_EARLY], # Code from module time: # Code from module time_r: # Code from module timespec: + # Code from module ttyname_r: # Code from module unistd: # Code from module unistd-safer: # Code from module unitypes: @@ -268,6 +282,7 @@ AC_DEFUN([gl_EARLY], # Code from module unlinkat: # Code from module unlinkdir: # Code from module unlocked-io: + # Code from module unlockpt: # Code from module unsetenv: # Code from module utimens: # Code from module utimensat: @@ -399,7 +414,20 @@ AC_DEFUN([gl_INIT], m4_ifdef([AM_XGETTEXT_OPTION], [AM_][XGETTEXT_OPTION([--flag=error:3:c-format]) AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])]) + gl_FUNC_EUIDACCESS + if test $HAVE_EUIDACCESS = 0; then + AC_LIBOBJ([euidaccess]) + gl_PREREQ_EUIDACCESS + fi + gl_UNISTD_MODULE_INDICATOR([euidaccess]) AC_REQUIRE([gl_EXTERN_INLINE]) + gl_FUNC_FACCESSAT + if test $HAVE_FACCESSAT = 0; then + AC_LIBOBJ([faccessat]) + gl_PREREQ_FACCESSAT + fi + gl_MODULE_INDICATOR([faccessat]) + gl_UNISTD_MODULE_INDICATOR([faccessat]) gl_FUNC_FCHDIR gl_UNISTD_MODULE_INDICATOR([fchdir]) gl_FUNC_FCHMODAT @@ -451,7 +479,7 @@ AC_DEFUN([gl_INIT], gl_PREREQ_FNMATCH fi gl_FUNC_FPENDING - if test $ac_cv_func___fpending = no; then + if test $gl_cv_func___fpending = no; then AC_LIBOBJ([fpending]) gl_PREREQ_FPENDING fi @@ -501,11 +529,16 @@ AC_DEFUN([gl_INIT], fi gl_STDIO_MODULE_INDICATOR([getdelim]) gl_FUNC_GETDTABLESIZE - if test $HAVE_GETDTABLESIZE = 0; then + if test $HAVE_GETDTABLESIZE = 0 || test $REPLACE_GETDTABLESIZE = 1; then AC_LIBOBJ([getdtablesize]) gl_PREREQ_GETDTABLESIZE fi gl_UNISTD_MODULE_INDICATOR([getdtablesize]) + gl_FUNC_GETGROUPS + if test $HAVE_GETGROUPS = 0 || test $REPLACE_GETGROUPS = 1; then + AC_LIBOBJ([getgroups]) + fi + gl_UNISTD_MODULE_INDICATOR([getgroups]) gl_FUNC_GETLINE if test $REPLACE_GETLINE = 1; then AC_LIBOBJ([getline]) @@ -547,10 +580,22 @@ AC_DEFUN([gl_INIT], gl_PREREQ_GETTIMEOFDAY fi gl_SYS_TIME_MODULE_INDICATOR([gettimeofday]) + gl_FUNC_GROUP_MEMBER + if test $HAVE_GROUP_MEMBER = 0; then + AC_LIBOBJ([group-member]) + gl_PREREQ_GROUP_MEMBER + fi + gl_UNISTD_MODULE_INDICATOR([group-member]) gl_HUMAN gl_INTTOSTR gl_INTTYPES_H gl_INTTYPES_INCOMPLETE + gl_FUNC_ISATTY + if test $REPLACE_ISATTY = 1; then + AC_LIBOBJ([isatty]) + gl_PREREQ_ISATTY + fi + gl_UNISTD_MODULE_INDICATOR([isatty]) gl_FUNC_ISWBLANK if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then : @@ -737,9 +782,26 @@ AC_DEFUN([gl_INIT], gl_DIRENT_MODULE_INDICATOR([opendir]) gl_PARSE_DATETIME gl_PATHMAX + gl_FUNC_POSIX_OPENPT + if test $HAVE_POSIX_OPENPT = 0; then + AC_LIBOBJ([posix_openpt]) + fi + gl_STDLIB_MODULE_INDICATOR([posix_openpt]) gl_PRIV_SET AC_CHECK_DECLS([program_invocation_name], [], [], [#include ]) AC_CHECK_DECLS([program_invocation_short_name], [], [], [#include ]) + gl_FUNC_PTSNAME + if test $HAVE_PTSNAME = 0 || test $REPLACE_PTSNAME = 1; then + AC_LIBOBJ([ptsname]) + gl_PREREQ_PTSNAME + fi + gl_STDLIB_MODULE_INDICATOR([ptsname]) + gl_FUNC_PTSNAME_R + if test $HAVE_PTSNAME_R = 0 || test $REPLACE_PTSNAME_R = 1; then + AC_LIBOBJ([ptsname_r]) + gl_PREREQ_PTSNAME_R + fi + gl_STDLIB_MODULE_INDICATOR([ptsname_r]) gl_FUNC_ACL gl_QUOTE gl_QUOTEARG @@ -904,6 +966,7 @@ AC_DEFUN([gl_INIT], AC_LIBOBJ([strerror-override]) gl_PREREQ_SYS_H_WINSOCK2 fi + gl_FUNC_GNU_STRFTIME gl_HEADER_STRING_H gl_HEADER_STRINGS_H gl_FUNC_STRNDUP @@ -917,10 +980,22 @@ AC_DEFUN([gl_INIT], gl_PREREQ_STRNLEN fi gl_STRING_MODULE_INDICATOR([strnlen]) + gl_FUNC_STRTOIMAX + if test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; then + AC_LIBOBJ([strtoimax]) + gl_PREREQ_STRTOIMAX + fi + gl_INTTYPES_MODULE_INDICATOR([strtoimax]) gl_FUNC_STRTOL if test $ac_cv_func_strtol = no; then AC_LIBOBJ([strtol]) fi + gl_FUNC_STRTOLL + if test $HAVE_STRTOLL = 0; then + AC_LIBOBJ([strtoll]) + gl_PREREQ_STRTOLL + fi + gl_STDLIB_MODULE_INDICATOR([strtoll]) gl_FUNC_STRTOUL if test $ac_cv_func_strtoul = no; then AC_LIBOBJ([strtoul]) @@ -932,7 +1007,7 @@ AC_DEFUN([gl_INIT], fi gl_STDLIB_MODULE_INDICATOR([strtoull]) gl_FUNC_STRTOUMAX - if test $ac_cv_func_strtoumax = no; then + if test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; then AC_LIBOBJ([strtoumax]) gl_PREREQ_STRTOUMAX fi @@ -963,6 +1038,12 @@ AC_DEFUN([gl_INIT], fi gl_TIME_MODULE_INDICATOR([time_r]) gl_TIMESPEC + gl_FUNC_TTYNAME_R + if test $HAVE_TTYNAME_R = 0 || test $REPLACE_TTYNAME_R = 1; then + AC_LIBOBJ([ttyname_r]) + gl_PREREQ_TTYNAME_R + fi + gl_UNISTD_MODULE_INDICATOR([ttyname_r]) gl_UNISTD_H gl_UNISTD_SAFER gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h]) @@ -980,6 +1061,12 @@ AC_DEFUN([gl_INIT], gl_UNISTD_MODULE_INDICATOR([unlinkat]) gl_UNLINKDIR gl_FUNC_GLIBC_UNLOCKED_IO + gl_FUNC_UNLOCKPT + if test $HAVE_UNLOCKPT = 0; then + AC_LIBOBJ([unlockpt]) + gl_PREREQ_UNLOCKPT + fi + gl_STDLIB_MODULE_INDICATOR([unlockpt]) gl_FUNC_UNSETENV if test $HAVE_UNSETENV = 0 || test $REPLACE_UNSETENV = 1; then AC_LIBOBJ([unsetenv]) @@ -1169,6 +1256,7 @@ AC_DEFUN([gltests_LIBSOURCES], [ # gnulib-tool and may be removed by future gnulib-tool invocations. AC_DEFUN([gl_FILE_LIST], [ build-aux/config.rpath + build-aux/git-log-fix build-aux/gitlog-to-changelog build-aux/snippet/_Noreturn.h build-aux/snippet/arg-nonnull.h @@ -1255,10 +1343,12 @@ AC_DEFUN([gl_FILE_LIST], [ lib/errno.in.h lib/error.c lib/error.h + lib/euidaccess.c lib/exclude.c lib/exclude.h lib/exitfail.c lib/exitfail.h + lib/faccessat.c lib/fchdir.c lib/fchmodat.c lib/fchown-stub.c @@ -1283,6 +1373,8 @@ AC_DEFUN([gl_FILE_LIST], [ lib/fnmatch_loop.c lib/fpending.c lib/fpending.h + lib/fprintftime.c + lib/fprintftime.h lib/fseek.c lib/fseeko.c lib/fstat.c @@ -1295,6 +1387,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/getdelim.c lib/getdtablesize.c lib/getfilecon.c + lib/getgroups.c lib/getline.c lib/getopt.c lib/getopt.in.h @@ -1304,6 +1397,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/gettext.h lib/gettime.c lib/gettimeofday.c + lib/group-member.c lib/hash.c lib/hash.h lib/human.c @@ -1313,6 +1407,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/inttostr.c lib/inttostr.h lib/inttypes.in.h + lib/isatty.c lib/iswblank.c lib/itold.c lib/langinfo.in.h @@ -1376,6 +1471,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/parse-datetime.y lib/pathmax.h lib/pipe-safer.c + lib/posix_openpt.c lib/printf-args.c lib/printf-args.h lib/printf-parse.c @@ -1384,6 +1480,8 @@ AC_DEFUN([gl_FILE_LIST], [ lib/priv-set.h lib/progname.c lib/progname.h + lib/ptsname.c + lib/ptsname_r.c lib/qcopy-acl.c lib/qset-acl.c lib/quote.h @@ -1455,6 +1553,8 @@ AC_DEFUN([gl_FILE_LIST], [ lib/strerror-override.c lib/strerror-override.h lib/strerror.c + lib/strftime.c + lib/strftime.h lib/string.in.h lib/strings.in.h lib/stripslash.c @@ -1465,6 +1565,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/strnlen1.h lib/strtoimax.c lib/strtol.c + lib/strtoll.c lib/strtoul.c lib/strtoull.c lib/strtoumax.c @@ -1480,6 +1581,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/time_r.c lib/timespec.c lib/timespec.h + lib/ttyname_r.c lib/uinttostr.c lib/umaxtostr.c lib/unistd--.h @@ -1495,6 +1597,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/unlinkdir.c lib/unlinkdir.h lib/unlocked-io.h + lib/unlockpt.c lib/unsetenv.c lib/utimens.c lib/utimens.h @@ -1532,6 +1635,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/xvasprintf.c lib/xvasprintf.h m4/00gnulib.m4 + m4/absolute-header.m4 m4/acl.m4 m4/alloca.m4 m4/argp.m4 @@ -1560,9 +1664,11 @@ AC_DEFUN([gl_FILE_LIST], [ m4/environ.m4 m4/errno_h.m4 m4/error.m4 + m4/euidaccess.m4 m4/exponentd.m4 m4/extensions.m4 m4/extern-inline.m4 + m4/faccessat.m4 m4/fchdir.m4 m4/fchmodat.m4 m4/fchownat.m4 @@ -1585,6 +1691,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/getcwd.m4 m4/getdelim.m4 m4/getdtablesize.m4 + m4/getgroups.m4 m4/getline.m4 m4/getopt.m4 m4/getpagesize.m4 @@ -1594,6 +1701,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/glibc2.m4 m4/glibc21.m4 m4/gnulib-common.m4 + m4/group-member.m4 m4/human.m4 m4/iconv.m4 m4/include_next.m4 @@ -1607,6 +1715,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/inttypes-pri.m4 m4/inttypes.m4 m4/inttypes_h.m4 + m4/isatty.m4 m4/iswblank.m4 m4/langinfo_h.m4 m4/largefile.m4 @@ -1666,10 +1775,13 @@ AC_DEFUN([gl_FILE_LIST], [ m4/parse-datetime.m4 m4/pathmax.m4 m4/po.m4 + m4/posix_openpt.m4 m4/printf-posix.m4 m4/printf.m4 m4/priv-set.m4 m4/progtest.m4 + m4/ptsname.m4 + m4/ptsname_r.m4 m4/quote.m4 m4/quotearg.m4 m4/raise.m4 @@ -1713,11 +1825,14 @@ AC_DEFUN([gl_FILE_LIST], [ m4/strchrnul.m4 m4/strdup.m4 m4/strerror.m4 + m4/strftime.m4 m4/string_h.m4 m4/strings_h.m4 m4/strndup.m4 m4/strnlen.m4 + m4/strtoimax.m4 m4/strtol.m4 + m4/strtoll.m4 m4/strtoul.m4 m4/strtoull.m4 m4/strtoumax.m4 @@ -1734,6 +1849,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/time_r.m4 m4/timespec.m4 m4/tm_gmtoff.m4 + m4/ttyname_r.m4 m4/uintmax_t.m4 m4/unistd-safer.m4 m4/unistd_h.m4 @@ -1741,6 +1857,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/unlinkat.m4 m4/unlinkdir.m4 m4/unlocked-io.m4 + m4/unlockpt.m4 m4/utimbuf.m4 m4/utimens.m4 m4/utimensat.m4 diff --git a/m4/group-member.m4 b/m4/group-member.m4 new file mode 100644 index 0000000..11d55d6 --- /dev/null +++ b/m4/group-member.m4 @@ -0,0 +1,29 @@ +# serial 14 + +# Copyright (C) 1999-2001, 2003-2007, 2009-2014 Free Software Foundation, Inc. + +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +dnl Written by Jim Meyering + +AC_DEFUN([gl_FUNC_GROUP_MEMBER], +[ + AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + + dnl Persuade glibc to declare group_member(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + + dnl Do this replacement check manually because I want the hyphen + dnl (not the underscore) in the filename. + AC_CHECK_FUNC([group_member], , [ + HAVE_GROUP_MEMBER=0 + ]) +]) + +# Prerequisites of lib/group-member.c. +AC_DEFUN([gl_PREREQ_GROUP_MEMBER], +[ + AC_REQUIRE([AC_FUNC_GETGROUPS]) +]) diff --git a/m4/human.m4 b/m4/human.m4 index f152905..840b0d4 100644 --- a/m4/human.m4 +++ b/m4/human.m4 @@ -1,5 +1,5 @@ #serial 11 -dnl Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/iconv.m4 b/m4/iconv.m4 index a503646..4b29c5f 100644 --- a/m4/iconv.m4 +++ b/m4/iconv.m4 @@ -1,5 +1,5 @@ # iconv.m4 serial 18 (gettext-0.18.2) -dnl Copyright (C) 2000-2002, 2007-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/include_next.m4 b/m4/include_next.m4 index 108d945..69ad3db 100644 --- a/m4/include_next.m4 +++ b/m4/include_next.m4 @@ -1,5 +1,5 @@ # include_next.m4 serial 23 -dnl Copyright (C) 2006-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -192,56 +192,9 @@ dnl until we can assume autoconf 2.64 or newer. if test AS_VAR_GET(gl_header_exists) = yes; then AS_VAR_POPDEF([gl_header_exists]) ]) - AC_LANG_CONFTEST( - [AC_LANG_SOURCE( - [[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]] - )]) - dnl AIX "xlc -E" and "cc -E" omit #line directives for header - dnl files that contain only a #include of other header files and - dnl no non-comment tokens of their own. This leads to a failure - dnl to detect the absolute name of , , - dnl and others. The workaround is to force preservation - dnl of comments through option -C. This ensures all necessary - dnl #line directives are present. GCC supports option -C as well. - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac -changequote(,) - case "$host_os" in - mingw*) - dnl For the sake of native Windows compilers (excluding gcc), - dnl treat backslash as a directory separator, like /. - dnl Actually, these compilers use a double-backslash as - dnl directory separator, inside the - dnl # line "filename" - dnl directives. - gl_dirsep_regex='[/\\]' - ;; - *) - gl_dirsep_regex='\/' - ;; - esac - dnl A sed expression that turns a string into a basic regular - dnl expression, for use within "/.../". - gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' -changequote([,]) - gl_header_literal_regex=`echo ']m4_defn([gl_HEADER_NAME])[' \ - | sed -e "$gl_make_literal_regex_sed"` - gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ - s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ -changequote(,)dnl - s|^/[^/]|//&| -changequote([,])dnl - p - q - }' - dnl eval is necessary to expand gl_absname_cpp. - dnl Ultrix and Pyramid sh refuse to redirect output of eval, - dnl so use subshell. - AS_VAR_SET(gl_next_header, - ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | - sed -n "$gl_absolute_header_sed"`'"']) + gl_ABSOLUTE_HEADER_ONE(gl_HEADER_NAME) + AS_VAR_COPY([gl_header], [gl_cv_absolute_]AS_TR_SH(gl_HEADER_NAME)) + AS_VAR_SET(gl_next_header, ['"'$gl_header'"']) m4_if([$2], [check], [else AS_VAR_SET(gl_next_header, ['<'gl_HEADER_NAME'>']) diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4 index ab97d39..8a045f6 100644 --- a/m4/intlmacosx.m4 +++ b/m4/intlmacosx.m4 @@ -1,5 +1,5 @@ # intlmacosx.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2004-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/intmax_t.m4 b/m4/intmax_t.m4 index 6ea7053..af5561e 100644 --- a/m4/intmax_t.m4 +++ b/m4/intmax_t.m4 @@ -1,5 +1,5 @@ # intmax_t.m4 serial 8 -dnl Copyright (C) 1997-2004, 2006-2007, 2009-2013 Free Software Foundation, +dnl Copyright (C) 1997-2004, 2006-2007, 2009-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/inttostr.m4 b/m4/inttostr.m4 index 1a0ce74..c48e9de 100644 --- a/m4/inttostr.m4 +++ b/m4/inttostr.m4 @@ -1,5 +1,5 @@ #serial 8 -dnl Copyright (C) 2004-2006, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2006, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4 index e5a1e05..00251e1 100644 --- a/m4/inttypes-pri.m4 +++ b/m4/inttypes-pri.m4 @@ -1,5 +1,5 @@ # inttypes-pri.m4 serial 7 (gettext-0.18.2) -dnl Copyright (C) 1997-2002, 2006, 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2002, 2006, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 index 3b483d3..2f9317d 100644 --- a/m4/inttypes.m4 +++ b/m4/inttypes.m4 @@ -1,5 +1,5 @@ # inttypes.m4 serial 26 -dnl Copyright (C) 2006-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -148,6 +148,7 @@ AC_DEFUN([gl_INTTYPES_H_DEFAULTS], HAVE_DECL_STRTOIMAX=1; AC_SUBST([HAVE_DECL_STRTOIMAX]) HAVE_DECL_STRTOUMAX=1; AC_SUBST([HAVE_DECL_STRTOUMAX]) REPLACE_STRTOIMAX=0; AC_SUBST([REPLACE_STRTOIMAX]) + REPLACE_STRTOUMAX=0; AC_SUBST([REPLACE_STRTOUMAX]) INT32_MAX_LT_INTMAX_MAX=1; AC_SUBST([INT32_MAX_LT_INTMAX_MAX]) INT64_MAX_EQ_LONG_MAX='defined _LP64'; AC_SUBST([INT64_MAX_EQ_LONG_MAX]) PRI_MACROS_BROKEN=0; AC_SUBST([PRI_MACROS_BROKEN]) diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4 index 5f05ac5..87be9cf 100644 --- a/m4/inttypes_h.m4 +++ b/m4/inttypes_h.m4 @@ -1,5 +1,5 @@ # inttypes_h.m4 serial 10 -dnl Copyright (C) 1997-2004, 2006, 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2004, 2006, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/isatty.m4 b/m4/isatty.m4 new file mode 100644 index 0000000..6fcf931 --- /dev/null +++ b/m4/isatty.m4 @@ -0,0 +1,19 @@ +# isatty.m4 serial 3 +dnl Copyright (C) 2012-2014 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_FUNC_ISATTY], +[ + AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + dnl On native Windows, the system's isatty(), defined as an alias of _isatty() + dnl in the "oldnames" library, returns true for the NUL device. + case $host_os in + mingw*) REPLACE_ISATTY=1 ;; + esac +]) + +# Prerequisites of lib/isatty.c. +AC_DEFUN([gl_PREREQ_ISATTY], [:]) diff --git a/m4/iswblank.m4 b/m4/iswblank.m4 index b736497..a9ce0a3 100644 --- a/m4/iswblank.m4 +++ b/m4/iswblank.m4 @@ -1,5 +1,5 @@ # iswblank.m4 serial 4 -dnl Copyright (C) 2011-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/langinfo_h.m4 b/m4/langinfo_h.m4 index 73bef8b..e8d78f9 100644 --- a/m4/langinfo_h.m4 +++ b/m4/langinfo_h.m4 @@ -1,5 +1,5 @@ # langinfo_h.m4 serial 7 -dnl Copyright (C) 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/largefile.m4 b/m4/largefile.m4 index 1e605e3..a1b564a 100644 --- a/m4/largefile.m4 +++ b/m4/largefile.m4 @@ -1,6 +1,6 @@ # Enable large files on systems where this is not the default. -# Copyright 1992-1996, 1998-2013 Free Software Foundation, Inc. +# Copyright 1992-1996, 1998-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/lchown.m4 b/m4/lchown.m4 index 9401d9f..743ed5b 100644 --- a/m4/lchown.m4 +++ b/m4/lchown.m4 @@ -1,7 +1,7 @@ # serial 17 # Determine whether we need the lchown wrapper. -dnl Copyright (C) 1998, 2001, 2003-2007, 2009-2013 Free Software Foundation, +dnl Copyright (C) 1998, 2001, 2003-2007, 2009-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 index c145e47..ddc569f 100644 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -1,5 +1,5 @@ # lib-ld.m4 serial 6 -dnl Copyright (C) 1996-2003, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 1996-2003, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/lib-link.m4 b/m4/lib-link.m4 index 073f040..3522d99 100644 --- a/m4/lib-link.m4 +++ b/m4/lib-link.m4 @@ -1,5 +1,5 @@ # lib-link.m4 serial 26 (gettext-0.18.2) -dnl Copyright (C) 2001-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4 index 60908e8..31f49e4 100644 --- a/m4/lib-prefix.m4 +++ b/m4/lib-prefix.m4 @@ -1,5 +1,5 @@ # lib-prefix.m4 serial 7 (gettext-0.18) -dnl Copyright (C) 2001-2005, 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2005, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/libunistring-base.m4 b/m4/libunistring-base.m4 index d105c72..d003267 100644 --- a/m4/libunistring-base.m4 +++ b/m4/libunistring-base.m4 @@ -1,5 +1,5 @@ # libunistring-base.m4 serial 5 -dnl Copyright (C) 2010-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/link-follow.m4 b/m4/link-follow.m4 index 35c4fce..8b15585 100644 --- a/m4/link-follow.m4 +++ b/m4/link-follow.m4 @@ -2,7 +2,7 @@ dnl Run a program to determine whether link(2) follows symlinks. dnl Set LINK_FOLLOWS_SYMLINKS accordingly. -# Copyright (C) 1999-2001, 2004-2006, 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2004-2006, 2009-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/link.m4 b/m4/link.m4 index 7cc0ceb..e923d0d 100644 --- a/m4/link.m4 +++ b/m4/link.m4 @@ -1,5 +1,5 @@ # link.m4 serial 8 -dnl Copyright (C) 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/linkat.m4 b/m4/linkat.m4 index b561dda..2da0e30 100644 --- a/m4/linkat.m4 +++ b/m4/linkat.m4 @@ -1,7 +1,7 @@ # serial 6 # See if we need to provide linkat replacement. -dnl Copyright (C) 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/localcharset.m4 b/m4/localcharset.m4 index 2e93e58..ada2f01 100644 --- a/m4/localcharset.m4 +++ b/m4/localcharset.m4 @@ -1,5 +1,5 @@ # localcharset.m4 serial 7 -dnl Copyright (C) 2002, 2004, 2006, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004, 2006, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/locale-fr.m4 b/m4/locale-fr.m4 index ef199e3..27db5ab 100644 --- a/m4/locale-fr.m4 +++ b/m4/locale-fr.m4 @@ -1,5 +1,5 @@ # locale-fr.m4 serial 17 -dnl Copyright (C) 2003, 2005-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/locale-ja.m4 b/m4/locale-ja.m4 index 132a3e7..c88fe8b 100644 --- a/m4/locale-ja.m4 +++ b/m4/locale-ja.m4 @@ -1,5 +1,5 @@ # locale-ja.m4 serial 12 -dnl Copyright (C) 2003, 2005-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/locale-zh.m4 b/m4/locale-zh.m4 index 4eed73f..d3b2347 100644 --- a/m4/locale-zh.m4 +++ b/m4/locale-zh.m4 @@ -1,5 +1,5 @@ # locale-zh.m4 serial 12 -dnl Copyright (C) 2003, 2005-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/locale_h.m4 b/m4/locale_h.m4 index 8bd12e8..2838588 100644 --- a/m4/locale_h.m4 +++ b/m4/locale_h.m4 @@ -1,5 +1,5 @@ # locale_h.m4 serial 19 -dnl Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/localeconv.m4 b/m4/localeconv.m4 index b8bb596..1fd2919 100644 --- a/m4/localeconv.m4 +++ b/m4/localeconv.m4 @@ -1,5 +1,5 @@ # localeconv.m4 serial 1 -dnl Copyright (C) 2012-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2012-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/longlong.m4 b/m4/longlong.m4 index 3af6ab5..eefb37c 100644 --- a/m4/longlong.m4 +++ b/m4/longlong.m4 @@ -1,5 +1,5 @@ # longlong.m4 serial 17 -dnl Copyright (C) 1999-2007, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 1999-2007, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/lseek.m4 b/m4/lseek.m4 index df9302a..0904d02 100644 --- a/m4/lseek.m4 +++ b/m4/lseek.m4 @@ -1,5 +1,5 @@ # lseek.m4 serial 10 -dnl Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/lstat.m4 b/m4/lstat.m4 index 5f4db64..c5e72b8 100644 --- a/m4/lstat.m4 +++ b/m4/lstat.m4 @@ -1,6 +1,6 @@ # serial 26 -# Copyright (C) 1997-2001, 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2001, 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/malloc.m4 b/m4/malloc.m4 index 4b24a0b..322ad6e 100644 --- a/m4/malloc.m4 +++ b/m4/malloc.m4 @@ -1,5 +1,5 @@ # malloc.m4 serial 14 -dnl Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/malloca.m4 b/m4/malloca.m4 index 791ce10..dcc1a08 100644 --- a/m4/malloca.m4 +++ b/m4/malloca.m4 @@ -1,5 +1,5 @@ # malloca.m4 serial 1 -dnl Copyright (C) 2003-2004, 2006-2007, 2009-2013 Free Software Foundation, +dnl Copyright (C) 2003-2004, 2006-2007, 2009-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/manywarnings.m4 b/m4/manywarnings.m4 index be6d4c9..e1cee6c 100644 --- a/m4/manywarnings.m4 +++ b/m4/manywarnings.m4 @@ -1,5 +1,5 @@ -# manywarnings.m4 serial 5 -dnl Copyright (C) 2008-2013 Free Software Foundation, Inc. +# manywarnings.m4 serial 6 +dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -146,7 +146,6 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC], -Wmissing-include-dirs \ -Wmissing-parameter-type \ -Wmissing-prototypes \ - -Wmudflap \ -Wmultichar \ -Wnarrowing \ -Wnested-externs \ @@ -204,6 +203,8 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC], -Wvla \ -Wvolatile-register-var \ -Wwrite-strings \ + -fdiagnostics-show-option \ + -funit-at-a-time \ \ ; do gl_manywarn_set="$gl_manywarn_set $gl_manywarn_item" diff --git a/m4/mbchar.m4 b/m4/mbchar.m4 index b18ecef..e250ca8 100644 --- a/m4/mbchar.m4 +++ b/m4/mbchar.m4 @@ -1,5 +1,5 @@ # mbchar.m4 serial 9 -dnl Copyright (C) 2005-2007, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbiter.m4 b/m4/mbiter.m4 index 9b5fced..648bf45 100644 --- a/m4/mbiter.m4 +++ b/m4/mbiter.m4 @@ -1,5 +1,5 @@ # mbiter.m4 serial 7 -dnl Copyright (C) 2005, 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4 index 4c9f388..a9d1570 100644 --- a/m4/mbrtowc.m4 +++ b/m4/mbrtowc.m4 @@ -1,5 +1,5 @@ # mbrtowc.m4 serial 25 -dnl Copyright (C) 2001-2002, 2004-2005, 2008-2013 Free Software Foundation, +dnl Copyright (C) 2001-2002, 2004-2005, 2008-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/mbsinit.m4 b/m4/mbsinit.m4 index 2e6d092..e1598a1 100644 --- a/m4/mbsinit.m4 +++ b/m4/mbsinit.m4 @@ -1,5 +1,5 @@ # mbsinit.m4 serial 8 -dnl Copyright (C) 2008, 2010-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2008, 2010-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbsrtowcs.m4 b/m4/mbsrtowcs.m4 index c4934c2..6967f35 100644 --- a/m4/mbsrtowcs.m4 +++ b/m4/mbsrtowcs.m4 @@ -1,5 +1,5 @@ # mbsrtowcs.m4 serial 13 -dnl Copyright (C) 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbstate_t.m4 b/m4/mbstate_t.m4 index ed00117..068155a 100644 --- a/m4/mbstate_t.m4 +++ b/m4/mbstate_t.m4 @@ -1,5 +1,5 @@ # mbstate_t.m4 serial 13 -dnl Copyright (C) 2000-2002, 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2000-2002, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mbtowc.m4 b/m4/mbtowc.m4 index e479461..cacfe16 100644 --- a/m4/mbtowc.m4 +++ b/m4/mbtowc.m4 @@ -1,5 +1,5 @@ # mbtowc.m4 serial 2 -dnl Copyright (C) 2011-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/memchr.m4 b/m4/memchr.m4 index 2d8abe7..b9f126c 100644 --- a/m4/memchr.m4 +++ b/m4/memchr.m4 @@ -1,5 +1,5 @@ # memchr.m4 serial 12 -dnl Copyright (C) 2002-2004, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4 index a48f2d1..b6d0b14 100644 --- a/m4/mempcpy.m4 +++ b/m4/mempcpy.m4 @@ -1,5 +1,5 @@ # mempcpy.m4 serial 11 -dnl Copyright (C) 2003-2004, 2006-2007, 2009-2013 Free Software Foundation, +dnl Copyright (C) 2003-2004, 2006-2007, 2009-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/memrchr.m4 b/m4/memrchr.m4 index 5920f57..5dbe4d1 100644 --- a/m4/memrchr.m4 +++ b/m4/memrchr.m4 @@ -1,5 +1,5 @@ # memrchr.m4 serial 10 -dnl Copyright (C) 2002-2003, 2005-2007, 2009-2013 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/mkdir.m4 b/m4/mkdir.m4 index bcbce18..51e78c1 100644 --- a/m4/mkdir.m4 +++ b/m4/mkdir.m4 @@ -1,6 +1,6 @@ # serial 11 -# Copyright (C) 2001, 2003-2004, 2006, 2008-2013 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003-2004, 2006, 2008-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/mkdirat.m4 b/m4/mkdirat.m4 index d22604a..fe63b42 100644 --- a/m4/mkdirat.m4 +++ b/m4/mkdirat.m4 @@ -1,5 +1,5 @@ # mkdirat.m4 serial 1 -dnl Copyright (C) 2004-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mkdtemp.m4 b/m4/mkdtemp.m4 index b7c0a61..dcc2ac0 100644 --- a/m4/mkdtemp.m4 +++ b/m4/mkdtemp.m4 @@ -1,5 +1,5 @@ # mkdtemp.m4 serial 8 -dnl Copyright (C) 2001-2003, 2006-2007, 2009-2013 Free Software Foundation, +dnl Copyright (C) 2001-2003, 2006-2007, 2009-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/mkfifo.m4 b/m4/mkfifo.m4 index e571c64..4328d8f 100644 --- a/m4/mkfifo.m4 +++ b/m4/mkfifo.m4 @@ -1,7 +1,7 @@ # serial 4 # See if we need to provide mkfifo replacement. -dnl Copyright (C) 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mkfifoat.m4 b/m4/mkfifoat.m4 index 61e052c..05f432f 100644 --- a/m4/mkfifoat.m4 +++ b/m4/mkfifoat.m4 @@ -1,7 +1,7 @@ # serial 3 # See if we need to provide mkfifoat/mknodat replacement. -dnl Copyright (C) 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mknod.m4 b/m4/mknod.m4 index 478ee55..8475bc3 100644 --- a/m4/mknod.m4 +++ b/m4/mknod.m4 @@ -1,7 +1,7 @@ # serial 5 # See if we need to provide mknod replacement. -dnl Copyright (C) 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mktime.m4 b/m4/mktime.m4 index faefb77..e8d340a 100644 --- a/m4/mktime.m4 +++ b/m4/mktime.m4 @@ -1,5 +1,5 @@ # serial 25 -dnl Copyright (C) 2002-2003, 2005-2007, 2009-2013 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/mmap-anon.m4 b/m4/mmap-anon.m4 index 9b60ddf..94ae2e2 100644 --- a/m4/mmap-anon.m4 +++ b/m4/mmap-anon.m4 @@ -1,5 +1,5 @@ # mmap-anon.m4 serial 10 -dnl Copyright (C) 2005, 2007, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2007, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/mode_t.m4 b/m4/mode_t.m4 index d5b66d4..db6e192 100644 --- a/m4/mode_t.m4 +++ b/m4/mode_t.m4 @@ -1,5 +1,5 @@ # mode_t.m4 serial 2 -dnl Copyright (C) 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/modechange.m4 b/m4/modechange.m4 index 949afb3..b89101e 100644 --- a/m4/modechange.m4 +++ b/m4/modechange.m4 @@ -1,5 +1,5 @@ # modechange.m4 serial 7 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/msvc-inval.m4 b/m4/msvc-inval.m4 index 9a6a47a..7f26087 100644 --- a/m4/msvc-inval.m4 +++ b/m4/msvc-inval.m4 @@ -1,5 +1,5 @@ # msvc-inval.m4 serial 1 -dnl Copyright (C) 2011-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/msvc-nothrow.m4 b/m4/msvc-nothrow.m4 index a39618a..9e32c17 100644 --- a/m4/msvc-nothrow.m4 +++ b/m4/msvc-nothrow.m4 @@ -1,5 +1,5 @@ # msvc-nothrow.m4 serial 1 -dnl Copyright (C) 2011-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/multiarch.m4 b/m4/multiarch.m4 index 552ec7e..2cb956d 100644 --- a/m4/multiarch.m4 +++ b/m4/multiarch.m4 @@ -1,5 +1,5 @@ # multiarch.m4 serial 7 -dnl Copyright (C) 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/nl_langinfo.m4 b/m4/nl_langinfo.m4 index 25e2101..6976e77 100644 --- a/m4/nl_langinfo.m4 +++ b/m4/nl_langinfo.m4 @@ -1,5 +1,5 @@ # nl_langinfo.m4 serial 5 -dnl Copyright (C) 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/nls.m4 b/m4/nls.m4 index 8f8a147..53cdc8b 100644 --- a/m4/nls.m4 +++ b/m4/nls.m4 @@ -1,5 +1,5 @@ # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/nocrash.m4 b/m4/nocrash.m4 index 105b884..5a5d77d 100644 --- a/m4/nocrash.m4 +++ b/m4/nocrash.m4 @@ -1,5 +1,5 @@ # nocrash.m4 serial 4 -dnl Copyright (C) 2005, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2005, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/off_t.m4 b/m4/off_t.m4 index d355d01..f5885b3 100644 --- a/m4/off_t.m4 +++ b/m4/off_t.m4 @@ -1,5 +1,5 @@ # off_t.m4 serial 1 -dnl Copyright (C) 2012-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2012-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/open.m4 b/m4/open.m4 index a6cb101..68f116f 100644 --- a/m4/open.m4 +++ b/m4/open.m4 @@ -1,5 +1,5 @@ # open.m4 serial 14 -dnl Copyright (C) 2007-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/openat.m4 b/m4/openat.m4 index 3bf9617..ad1d9d3 100644 --- a/m4/openat.m4 +++ b/m4/openat.m4 @@ -1,7 +1,7 @@ # serial 45 # See if we need to use our replacement for Solaris' openat et al functions. -dnl Copyright (C) 2004-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/opendir.m4 b/m4/opendir.m4 index d411680..fa29c64 100644 --- a/m4/opendir.m4 +++ b/m4/opendir.m4 @@ -1,5 +1,5 @@ # opendir.m4 serial 2 -dnl Copyright (C) 2011-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/parse-datetime.m4 b/m4/parse-datetime.m4 index 62ce16a..7873009 100644 --- a/m4/parse-datetime.m4 +++ b/m4/parse-datetime.m4 @@ -1,5 +1,5 @@ # parse-datetime.m4 serial 21 -dnl Copyright (C) 2002-2006, 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/pathmax.m4 b/m4/pathmax.m4 index e11bf57..114f91f 100644 --- a/m4/pathmax.m4 +++ b/m4/pathmax.m4 @@ -1,5 +1,5 @@ # pathmax.m4 serial 10 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/po.m4 b/m4/po.m4 index f395723..bd210c5 100644 --- a/m4/po.m4 +++ b/m4/po.m4 @@ -1,5 +1,5 @@ -# po.m4 serial 20 (gettext-0.18.2) -dnl Copyright (C) 1995-2013 Free Software Foundation, Inc. +# po.m4 serial 21 (gettext-0.18.3) +dnl Copyright (C) 1995-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -25,6 +25,7 @@ AC_DEFUN([AM_PO_SUBDIRS], AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl AC_REQUIRE([AC_PROG_MKDIR_P])dnl + AC_REQUIRE([AC_PROG_SED])dnl AC_REQUIRE([AM_NLS])dnl dnl Release version of the gettext macros. This is used to ensure that diff --git a/m4/posix_openpt.m4 b/m4/posix_openpt.m4 new file mode 100644 index 0000000..252a074 --- /dev/null +++ b/m4/posix_openpt.m4 @@ -0,0 +1,19 @@ +# posix_openpt.m4 serial 2 +dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_FUNC_POSIX_OPENPT], +[ + AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) + + dnl Persuade Solaris to declare posix_openpt(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + + AC_CHECK_FUNCS_ONCE([posix_openpt]) + if test $ac_cv_func_posix_openpt != yes; then + dnl The system does not have posix_openpt. + HAVE_POSIX_OPENPT=0 + fi +]) diff --git a/m4/printf.m4 b/m4/printf.m4 index ef44f78..9346ab0 100644 --- a/m4/printf.m4 +++ b/m4/printf.m4 @@ -1,5 +1,5 @@ # printf.m4 serial 50 -dnl Copyright (C) 2003, 2007-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/priv-set.m4 b/m4/priv-set.m4 index 41a0aaf..6a1ed24 100644 --- a/m4/priv-set.m4 +++ b/m4/priv-set.m4 @@ -1,6 +1,6 @@ # serial 8 -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/progtest.m4 b/m4/progtest.m4 index 7b39123..b499f79 100644 --- a/m4/progtest.m4 +++ b/m4/progtest.m4 @@ -1,5 +1,5 @@ # progtest.m4 serial 7 (gettext-0.18.2) -dnl Copyright (C) 1996-2003, 2005, 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 1996-2003, 2005, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/ptsname.m4 b/m4/ptsname.m4 new file mode 100644 index 0000000..97e1707 --- /dev/null +++ b/m4/ptsname.m4 @@ -0,0 +1,43 @@ +# ptsname.m4 serial 3 +dnl Copyright (C) 2010-2014 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_FUNC_PTSNAME], +[ + AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + + dnl Persuade glibc to declare ptsname(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + + AC_CHECK_FUNCS([ptsname]) + if test $ac_cv_func_ptsname = no; then + HAVE_PTSNAME=0 + else + AC_CACHE_CHECK([whether ptsname sets errno on failure], + [gl_cv_func_ptsname_sets_errno], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM([[#include + ]], [[ + return ptsname (-1) || !errno; + ]])], + [gl_cv_func_ptsname_sets_errno=yes], + [gl_cv_func_ptsname_sets_errno=no], + [case "$host_os" in + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_ptsname_sets_errno="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_ptsname_sets_errno="guessing no" ;; + esac + ])]) + case $gl_cv_func_ptsname_sets_errno in + *no) REPLACE_PTSNAME=1 ;; + esac + fi +]) + +# Prerequisites of lib/ptsname.c. +AC_DEFUN([gl_PREREQ_PTSNAME], [ + : +]) diff --git a/m4/ptsname_r.m4 b/m4/ptsname_r.m4 new file mode 100644 index 0000000..08fbb50 --- /dev/null +++ b/m4/ptsname_r.m4 @@ -0,0 +1,83 @@ +# ptsname_r.m4 serial 3 +dnl Copyright (C) 2010-2014 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_FUNC_PTSNAME_R], +[ + AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + + dnl Persuade glibc to declare ptsname_r(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + + AC_CHECK_FUNCS_ONCE([ptsname_r]) + if test $ac_cv_func_ptsname_r = no; then + HAVE_PTSNAME_R=0 + else + dnl On OSF/1 5.1, the type of the third argument is 'int', not 'size_t', + dnl and the declaration is missing if _REENTRANT is not defined. + AC_CACHE_CHECK([whether ptsname_r has the same signature as in glibc], + [gl_cv_func_ptsname_r_signature_ok], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include + #include + /* Test whether ptsname_r is declared at all. */ + int (*f) (int, char *, size_t) = ptsname_r; + /* Test whether it has the same declaration as in glibc. */ + #undef ptsname_r + extern + #ifdef __cplusplus + "C" + #endif + int ptsname_r (int, char *, size_t); + ]], + [[return f (0, NULL, 0);]]) + ], + [gl_cv_func_ptsname_r_signature_ok=yes], + [gl_cv_func_ptsname_r_signature_ok=no]) + ]) + if test $gl_cv_func_ptsname_r_signature_ok = no; then + REPLACE_PTSNAME_R=1 + fi + fi +]) + +# Prerequisites of lib/ptsname.c. +AC_DEFUN([gl_PREREQ_PTSNAME_R], [ + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether isatty sets errno when it fails], + [gl_cv_func_isatty_sets_errno], + [AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[#include + #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ + # include + #else + # include + #endif + ]], + [[errno = 0; + isatty (-1); + return errno == 0; + ]]) + ], + [gl_cv_func_isatty_sets_errno=yes], + [gl_cv_func_isatty_sets_errno=no], + [case "$host_os" in + irix* | solaris* | mingw*) + gl_cv_func_isatty_sets_errno="guessing no";; + *) + gl_cv_func_isatty_sets_errno="guessing yes";; + esac + ]) + ]) + case "$gl_cv_func_isatty_sets_errno" in + *yes) ;; + *) + AC_DEFINE([ISATTY_FAILS_WITHOUT_SETTING_ERRNO], [1], + [Define to 1 if isatty() may fail without setting errno.]) + ;; + esac +]) diff --git a/m4/quote.m4 b/m4/quote.m4 index ac49236..95b3e71 100644 --- a/m4/quote.m4 +++ b/m4/quote.m4 @@ -1,5 +1,5 @@ # quote.m4 serial 6 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/quotearg.m4 b/m4/quotearg.m4 index bc0ef0c..eaebbf6 100644 --- a/m4/quotearg.m4 +++ b/m4/quotearg.m4 @@ -1,5 +1,5 @@ # quotearg.m4 serial 9 -dnl Copyright (C) 2002, 2004-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/raise.m4 b/m4/raise.m4 index 7df3317..8656578 100644 --- a/m4/raise.m4 +++ b/m4/raise.m4 @@ -1,5 +1,5 @@ # raise.m4 serial 3 -dnl Copyright (C) 2011-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/rawmemchr.m4 b/m4/rawmemchr.m4 index 8c50054..a35af40 100644 --- a/m4/rawmemchr.m4 +++ b/m4/rawmemchr.m4 @@ -1,5 +1,5 @@ # rawmemchr.m4 serial 2 -dnl Copyright (C) 2003, 2007-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/read.m4 b/m4/read.m4 index 81f0f3a..176b0b0 100644 --- a/m4/read.m4 +++ b/m4/read.m4 @@ -1,5 +1,5 @@ # read.m4 serial 4 -dnl Copyright (C) 2011-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/readdir.m4 b/m4/readdir.m4 index 4269bb4..bd7be5c 100644 --- a/m4/readdir.m4 +++ b/m4/readdir.m4 @@ -1,5 +1,5 @@ # readdir.m4 serial 1 -dnl Copyright (C) 2011-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/readlink.m4 b/m4/readlink.m4 index 96e5042..f9ce868 100644 --- a/m4/readlink.m4 +++ b/m4/readlink.m4 @@ -1,5 +1,5 @@ # readlink.m4 serial 12 -dnl Copyright (C) 2003, 2007, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/readlinkat.m4 b/m4/readlinkat.m4 index b2ff40d..65c0689 100644 --- a/m4/readlinkat.m4 +++ b/m4/readlinkat.m4 @@ -1,7 +1,7 @@ # serial 3 # See if we need to provide readlinkat replacement. -dnl Copyright (C) 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/realloc.m4 b/m4/realloc.m4 index d477fb4..f96537b 100644 --- a/m4/realloc.m4 +++ b/m4/realloc.m4 @@ -1,5 +1,5 @@ # realloc.m4 serial 13 -dnl Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/regex.m4 b/m4/regex.m4 index 6d29dcf..08bd46a 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,6 +1,6 @@ -# serial 64 +# serial 65 -# Copyright (C) 1996-2001, 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -28,6 +28,7 @@ AC_DEFUN([gl_REGEX], # If cross compiling, assume the test would fail and use the included # regex.c. AC_CHECK_DECLS_ONCE([alarm]) + AC_CHECK_HEADERS_ONCE([malloc.h]) AC_CACHE_CHECK([for working re_compile_pattern], [gl_cv_func_re_compile_pattern_working], [AC_RUN_IFELSE( @@ -37,9 +38,19 @@ AC_DEFUN([gl_REGEX], #include #include #include - #if HAVE_DECL_ALARM - # include + + #if defined M_CHECK_ACTION || HAVE_DECL_ALARM # include + # include + #endif + + #if HAVE_MALLOC_H + # include + #endif + + #ifdef M_CHECK_ACTION + /* Exit with distinguishable exit code. */ + static void sigabrt_no_core (int sig) { raise (SIGTERM); } #endif ]], [[int result = 0; @@ -49,11 +60,18 @@ AC_DEFUN([gl_REGEX], const char *s; struct re_registers regs; + /* Some builds of glibc go into an infinite loop on this + test. Use alarm to force death, and mallopt to avoid + malloc recursion in diagnosing the corrupted heap. */ #if HAVE_DECL_ALARM - /* Some builds of glibc go into an infinite loop on this test. */ signal (SIGALRM, SIG_DFL); alarm (2); #endif +#ifdef M_CHECK_ACTION + signal (SIGABRT, sigabrt_no_core); + mallopt (M_CHECK_ACTION, 2); +#endif + if (setlocale (LC_ALL, "en_US.UTF-8")) { { @@ -266,7 +284,8 @@ AC_DEFUN([gl_PREREQ_REGEX], AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([AC_TYPE_MBSTATE_T]) AC_REQUIRE([gl_EEMALLOC]) + AC_REQUIRE([gl_GLIBC21]) AC_CHECK_HEADERS([libintl.h]) - AC_CHECK_FUNCS_ONCE([isblank iswctype wcscoll]) + AC_CHECK_FUNCS_ONCE([isblank iswctype]) AC_CHECK_DECLS([isblank], [], [], [[#include ]]) ]) diff --git a/m4/rename.m4 b/m4/rename.m4 index 66430aa..ea57794 100644 --- a/m4/rename.m4 +++ b/m4/rename.m4 @@ -1,6 +1,6 @@ # serial 26 -# Copyright (C) 2001, 2003, 2005-2006, 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005-2006, 2009-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/renameat.m4 b/m4/renameat.m4 index 30a7d91..c248349 100644 --- a/m4/renameat.m4 +++ b/m4/renameat.m4 @@ -1,7 +1,7 @@ # serial 3 # See if we need to provide renameat replacement. -dnl Copyright (C) 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/rewinddir.m4 b/m4/rewinddir.m4 index ee9d9b9..06f5414 100644 --- a/m4/rewinddir.m4 +++ b/m4/rewinddir.m4 @@ -1,5 +1,5 @@ # rewinddir.m4 serial 1 -dnl Copyright (C) 2011-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/rmdir.m4 b/m4/rmdir.m4 index f6a02dd..db6a939 100644 --- a/m4/rmdir.m4 +++ b/m4/rmdir.m4 @@ -1,5 +1,5 @@ # rmdir.m4 serial 13 -dnl Copyright (C) 2002, 2005, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/rmt.m4 b/m4/rmt.m4 index 5225a6b..eaeff95 100644 --- a/m4/rmt.m4 +++ b/m4/rmt.m4 @@ -68,4 +68,5 @@ AC_DEFUN([PU_RMT],[ AC_DEFINE_UNQUOTED(DEFAULT_RMT_COMMAND, "$DEFAULT_RMT_COMMAND", [Define full file name of rmt program.]) fi + AM_CONDITIONAL([PU_RMT_COND],[test "$pu_cv_header_rmt" = yes]) ]) diff --git a/m4/rpmatch.m4 b/m4/rpmatch.m4 index 4edc466..6fd0f5d 100644 --- a/m4/rpmatch.m4 +++ b/m4/rpmatch.m4 @@ -1,5 +1,5 @@ # rpmatch.m4 serial 10 -dnl Copyright (C) 2002-2003, 2007-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/safe-read.m4 b/m4/safe-read.m4 index be5207a..f0c42e0 100644 --- a/m4/safe-read.m4 +++ b/m4/safe-read.m4 @@ -1,5 +1,5 @@ # safe-read.m4 serial 6 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/safe-write.m4 b/m4/safe-write.m4 index bc2a33f..66648bb 100644 --- a/m4/safe-write.m4 +++ b/m4/safe-write.m4 @@ -1,5 +1,5 @@ # safe-write.m4 serial 4 -dnl Copyright (C) 2002, 2005-2006, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/save-cwd.m4 b/m4/save-cwd.m4 index 74e1f56..68dd1c5 100644 --- a/m4/save-cwd.m4 +++ b/m4/save-cwd.m4 @@ -1,5 +1,5 @@ # serial 10 -dnl Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/savedir.m4 b/m4/savedir.m4 index 96fe928..8f617db 100644 --- a/m4/savedir.m4 +++ b/m4/savedir.m4 @@ -1,5 +1,5 @@ # savedir.m4 serial 10 -dnl Copyright (C) 2002-2003, 2005-2006, 2009-2013 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2006, 2009-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/secure_getenv.m4 b/m4/secure_getenv.m4 index 5da5298..149888d 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 Free Software Foundation, Inc. +dnl Copyright 2013-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/selinux-context-h.m4 b/m4/selinux-context-h.m4 index c85255b..1e4bcfe 100644 --- a/m4/selinux-context-h.m4 +++ b/m4/selinux-context-h.m4 @@ -1,5 +1,5 @@ # serial 3 -*- Autoconf -*- -# Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/selinux-selinux-h.m4 b/m4/selinux-selinux-h.m4 index 17cccff..af0696c 100644 --- a/m4/selinux-selinux-h.m4 +++ b/m4/selinux-selinux-h.m4 @@ -1,5 +1,5 @@ # serial 5 -*- Autoconf -*- -# Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -61,9 +61,11 @@ AC_DEFUN([gl_LIBSELINUX], AC_SUBST([LIB_SELINUX]) # Warn if SELinux is found but libselinux is absent; - if test "$ac_cv_search_setfilecon" = no && - test "$host" = "$build" && test -d /selinux; then - AC_MSG_WARN([This system supports SELinux but libselinux is missing.]) - AC_MSG_WARN([AC_PACKAGE_NAME will be compiled without SELinux support.]) + if test "$ac_cv_search_setfilecon" = no; then + if test "$host" = "$build" && test -d /selinux; then + AC_MSG_WARN([This system supports SELinux but libselinux is missing.]) + AC_MSG_WARN([AC_PACKAGE_NAME will be compiled without SELinux support.]) + fi + with_selinux=no fi ]) diff --git a/m4/setenv.m4 b/m4/setenv.m4 index cb5351a..0f46a7b 100644 --- a/m4/setenv.m4 +++ b/m4/setenv.m4 @@ -1,5 +1,5 @@ # setenv.m4 serial 26 -dnl Copyright (C) 2001-2004, 2006-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2004, 2006-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/signal_h.m4 b/m4/signal_h.m4 index 3de9f27..c8f664f 100644 --- a/m4/signal_h.m4 +++ b/m4/signal_h.m4 @@ -1,5 +1,5 @@ # signal_h.m4 serial 18 -dnl Copyright (C) 2007-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/size_max.m4 b/m4/size_max.m4 index 4b247ab..7e192d5 100644 --- a/m4/size_max.m4 +++ b/m4/size_max.m4 @@ -1,5 +1,5 @@ # size_max.m4 serial 10 -dnl Copyright (C) 2003, 2005-2006, 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005-2006, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sleep.m4 b/m4/sleep.m4 index a27baa6..2f84da5 100644 --- a/m4/sleep.m4 +++ b/m4/sleep.m4 @@ -1,5 +1,5 @@ # sleep.m4 serial 7 -dnl Copyright (C) 2007-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/snprintf.m4 b/m4/snprintf.m4 index 3698e84..888db35 100644 --- a/m4/snprintf.m4 +++ b/m4/snprintf.m4 @@ -1,5 +1,5 @@ # snprintf.m4 serial 6 -dnl Copyright (C) 2002-2004, 2007-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/ssize_t.m4 b/m4/ssize_t.m4 index 6338134..fbe1d06 100644 --- a/m4/ssize_t.m4 +++ b/m4/ssize_t.m4 @@ -1,5 +1,5 @@ # ssize_t.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2001-2003, 2006, 2010-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2003, 2006, 2010-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stat-time.m4 b/m4/stat-time.m4 index d777f74..ea5c4fc 100644 --- a/m4/stat-time.m4 +++ b/m4/stat-time.m4 @@ -1,6 +1,6 @@ # Checks for stat-related time functions. -# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2013 Free Software +# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009-2014 Free Software # Foundation, Inc. # This file is free software; the Free Software Foundation diff --git a/m4/stat.m4 b/m4/stat.m4 index 2456297..1ae327b 100644 --- a/m4/stat.m4 +++ b/m4/stat.m4 @@ -1,6 +1,6 @@ # serial 11 -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/stdalign.m4 b/m4/stdalign.m4 index a866ff6..9efafe5 100644 --- a/m4/stdalign.m4 +++ b/m4/stdalign.m4 @@ -1,6 +1,6 @@ # Check for stdalign.h that conforms to C11. -dnl Copyright 2011-2013 Free Software Foundation, Inc. +dnl Copyright 2011-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -31,7 +31,8 @@ AC_DEFUN([gl_STDALIGN_H], /* Test _Alignas only on platforms where gnulib can help. */ #if \ - (__GNUC__ || __IBMC__ || __IBMCPP__ \ + ((defined __cplusplus && 201103 <= __cplusplus) \ + || __GNUC__ || __IBMC__ || __IBMCPP__ || __ICC \ || 0x5110 <= __SUNPRO_C || 1300 <= _MSC_VER) struct alignas_test { char c; char alignas (8) alignas_8; }; char test_alignas[offsetof (struct alignas_test, alignas_8) == 8 diff --git a/m4/stdarg.m4 b/m4/stdarg.m4 index c087f61..732aa31 100644 --- a/m4/stdarg.m4 +++ b/m4/stdarg.m4 @@ -1,5 +1,5 @@ # stdarg.m4 serial 6 -dnl Copyright (C) 2006, 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stdbool.m4 b/m4/stdbool.m4 index 80d5559..006ed52 100644 --- a/m4/stdbool.m4 +++ b/m4/stdbool.m4 @@ -1,6 +1,6 @@ # Check for stdbool.h that conforms to C99. -dnl Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stddef_h.m4 b/m4/stddef_h.m4 index 5da8ab1..c555e29 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-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stdint.m4 b/m4/stdint.m4 index 27cdcdb..1981d9d 100644 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 @@ -1,5 +1,5 @@ # stdint.m4 serial 43 -dnl Copyright (C) 2001-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2001-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4 index 511ab4e..7fc2ce9 100644 --- a/m4/stdint_h.m4 +++ b/m4/stdint_h.m4 @@ -1,5 +1,5 @@ # stdint_h.m4 serial 9 -dnl Copyright (C) 1997-2004, 2006, 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 1997-2004, 2006, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 index ebade06..d15913a 100644 --- a/m4/stdio_h.m4 +++ b/m4/stdio_h.m4 @@ -1,5 +1,5 @@ # stdio_h.m4 serial 43 -dnl Copyright (C) 2007-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 index 2027ab3..03b448b 100644 --- a/m4/stdlib_h.m4 +++ b/m4/stdlib_h.m4 @@ -1,5 +1,5 @@ # stdlib_h.m4 serial 42 -dnl Copyright (C) 2007-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/stpcpy.m4 b/m4/stpcpy.m4 index 41fcb0e..966ba95 100644 --- a/m4/stpcpy.m4 +++ b/m4/stpcpy.m4 @@ -1,5 +1,5 @@ # stpcpy.m4 serial 8 -dnl Copyright (C) 2002, 2007, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2007, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strcase.m4 b/m4/strcase.m4 index 22bf57c..66322b8 100644 --- a/m4/strcase.m4 +++ b/m4/strcase.m4 @@ -1,5 +1,5 @@ # strcase.m4 serial 11 -dnl Copyright (C) 2002, 2005-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strchrnul.m4 b/m4/strchrnul.m4 index b59eda9..ca9c99c 100644 --- a/m4/strchrnul.m4 +++ b/m4/strchrnul.m4 @@ -1,5 +1,5 @@ # strchrnul.m4 serial 9 -dnl Copyright (C) 2003, 2007, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strdup.m4 b/m4/strdup.m4 index efe2d57..1681a30 100644 --- a/m4/strdup.m4 +++ b/m4/strdup.m4 @@ -1,6 +1,6 @@ # strdup.m4 serial 13 -dnl Copyright (C) 2002-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/strerror.m4 b/m4/strerror.m4 index 3989844..0763fe3 100644 --- a/m4/strerror.m4 +++ b/m4/strerror.m4 @@ -1,5 +1,5 @@ # strerror.m4 serial 17 -dnl Copyright (C) 2002, 2007-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strftime.m4 b/m4/strftime.m4 new file mode 100644 index 0000000..0ba3dd0 --- /dev/null +++ b/m4/strftime.m4 @@ -0,0 +1,28 @@ +# serial 33 + +# Copyright (C) 1996-1997, 1999-2007, 2009-2014 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# Written by Jim Meyering and Paul Eggert. + +AC_DEFUN([gl_FUNC_GNU_STRFTIME], +[ + gl_FUNC_STRFTIME +]) + +# These are the prerequisite macros for GNU's strftime.c replacement. +AC_DEFUN([gl_FUNC_STRFTIME], +[ + # This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE. + AC_REQUIRE([AC_STRUCT_TIMEZONE]) + + AC_REQUIRE([gl_TM_GMTOFF]) + + AC_CHECK_FUNCS_ONCE([tzset]) + + AC_DEFINE([my_strftime], [nstrftime], + [Define to the name of the strftime replacement function.]) +]) diff --git a/m4/string_h.m4 b/m4/string_h.m4 index cc5fbbb..64e683f 100644 --- a/m4/string_h.m4 +++ b/m4/string_h.m4 @@ -1,6 +1,6 @@ # Configure a GNU-like replacement for . -# Copyright (C) 2007-2013 Free Software Foundation, Inc. +# Copyright (C) 2007-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/strings_h.m4 b/m4/strings_h.m4 index 76ef242..0eac17c 100644 --- a/m4/strings_h.m4 +++ b/m4/strings_h.m4 @@ -1,7 +1,7 @@ # Configure a replacement for . # serial 6 -# Copyright (C) 2007, 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/strndup.m4 b/m4/strndup.m4 index a1f8274..55df039 100644 --- a/m4/strndup.m4 +++ b/m4/strndup.m4 @@ -1,5 +1,5 @@ # strndup.m4 serial 21 -dnl Copyright (C) 2002-2003, 2005-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2005-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strnlen.m4 b/m4/strnlen.m4 index eae82b7..94317f8 100644 --- a/m4/strnlen.m4 +++ b/m4/strnlen.m4 @@ -1,5 +1,5 @@ # strnlen.m4 serial 13 -dnl Copyright (C) 2002-2003, 2005-2007, 2009-2013 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2005-2007, 2009-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4 new file mode 100644 index 0000000..7113781 --- /dev/null +++ b/m4/strtoimax.m4 @@ -0,0 +1,87 @@ +# strtoimax.m4 serial 14 +dnl Copyright (C) 2002-2004, 2006, 2009-2014 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_FUNC_STRTOIMAX], +[ + AC_REQUIRE([gl_INTTYPES_H_DEFAULTS]) + + dnl On OSF/1 5.1 with cc, this function is declared but not defined. + AC_CHECK_FUNCS_ONCE([strtoimax]) + AC_CHECK_DECLS_ONCE([strtoimax]) + if test "$ac_cv_have_decl_strtoimax" != yes; then + HAVE_DECL_STRTOIMAX=0 + fi + + if test "$ac_cv_func_strtoimax" = yes; then + HAVE_STRTOIMAX=1 + dnl On AIX 5.1, strtoimax() fails for values outside the 'int' range. + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([whether strtoimax works], [gl_cv_func_strtoimax], + [AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ +#include +#include +#include +int main () +{ + if (sizeof (intmax_t) > sizeof (int)) + { + const char *s = "4294967295"; + char *p; + intmax_t res; + errno = 0; + res = strtoimax (s, &p, 10); + if (p != s + strlen (s)) + return 1; + if (errno != 0) + return 2; + if (res != (intmax_t) 65535 * (intmax_t) 65537) + return 3; + } + else + { + const char *s = "2147483647"; + char *p; + intmax_t res; + errno = 0; + res = strtoimax (s, &p, 10); + if (p != s + strlen (s)) + return 1; + if (errno != 0) + return 2; + if (res != 2147483647) + return 3; + } + return 0; +} +]])], + [gl_cv_func_strtoimax=yes], + [gl_cv_func_strtoimax=no], + [case "$host_os" in + # Guess no on AIX 5. + aix5*) gl_cv_func_strtoimax="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_strtoimax="guessing yes" ;; + esac + ]) + ]) + case "$gl_cv_func_strtoimax" in + *no) REPLACE_STRTOIMAX=1 ;; + esac + else + if test "$ac_cv_have_decl_strtoimax" = yes; then + # HP-UX 11.11 has "#define strtoimax(...) ..." but no function. + REPLACE_STRTOIMAX=1 + fi + HAVE_STRTOIMAX=0 + fi +]) + +# Prerequisites of lib/strtoimax.c. +AC_DEFUN([gl_PREREQ_STRTOIMAX], [ + AC_CHECK_DECLS([strtoll]) + AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) +]) diff --git a/m4/strtol.m4 b/m4/strtol.m4 index b07a06c..9dd4546 100644 --- a/m4/strtol.m4 +++ b/m4/strtol.m4 @@ -1,5 +1,5 @@ # strtol.m4 serial 6 -dnl Copyright (C) 2002-2003, 2006, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2006, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strtoll.m4 b/m4/strtoll.m4 new file mode 100644 index 0000000..9f2a177 --- /dev/null +++ b/m4/strtoll.m4 @@ -0,0 +1,24 @@ +# strtoll.m4 serial 7 +dnl Copyright (C) 2002, 2004, 2006, 2008-2014 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_FUNC_STRTOLL], +[ + AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) + dnl We don't need (and can't compile) the replacement strtoll + dnl unless the type 'long long int' exists. + AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) + if test "$ac_cv_type_long_long_int" = yes; then + AC_CHECK_FUNCS([strtoll]) + if test $ac_cv_func_strtoll = no; then + HAVE_STRTOLL=0 + fi + fi +]) + +# Prerequisites of lib/strtoll.c. +AC_DEFUN([gl_PREREQ_STRTOLL], [ + : +]) diff --git a/m4/strtoul.m4 b/m4/strtoul.m4 index 00934ef..c7c0d24 100644 --- a/m4/strtoul.m4 +++ b/m4/strtoul.m4 @@ -1,5 +1,5 @@ # strtoul.m4 serial 5 -dnl Copyright (C) 2002, 2006, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2006, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strtoull.m4 b/m4/strtoull.m4 index ad386da..f4d5f61 100644 --- a/m4/strtoull.m4 +++ b/m4/strtoull.m4 @@ -1,5 +1,5 @@ # strtoull.m4 serial 7 -dnl Copyright (C) 2002, 2004, 2006, 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2004, 2006, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/strtoumax.m4 b/m4/strtoumax.m4 index 6a6aeb5..fc582fc 100644 --- a/m4/strtoumax.m4 +++ b/m4/strtoumax.m4 @@ -1,5 +1,5 @@ -# strtoumax.m4 serial 11 -dnl Copyright (C) 2002-2004, 2006, 2009-2013 Free Software Foundation, Inc. +# strtoumax.m4 serial 12 +dnl Copyright (C) 2002-2004, 2006, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -11,7 +11,12 @@ AC_DEFUN([gl_FUNC_STRTOUMAX], dnl On OSF/1 5.1 with cc, this function is declared but not defined. AC_CHECK_FUNCS_ONCE([strtoumax]) AC_CHECK_DECLS_ONCE([strtoumax]) - if test "$ac_cv_have_decl_strtoumax" != yes; then + if test "$ac_cv_have_decl_strtoumax" = yes; then + if test "$ac_cv_func_strtoumax" != yes; then + # HP-UX 11.11 has "#define strtoimax(...) ..." but no function. + REPLACE_STRTOUMAX=1 + fi + else HAVE_DECL_STRTOUMAX=0 fi ]) diff --git a/m4/symlink.m4 b/m4/symlink.m4 index 82ede2a..de4924b 100644 --- a/m4/symlink.m4 +++ b/m4/symlink.m4 @@ -1,7 +1,7 @@ # serial 6 # See if we need to provide symlink replacement. -dnl Copyright (C) 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/symlinkat.m4 b/m4/symlinkat.m4 index 779295f..db7ad48 100644 --- a/m4/symlinkat.m4 +++ b/m4/symlinkat.m4 @@ -1,7 +1,7 @@ # serial 5 # See if we need to provide symlinkat replacement. -dnl Copyright (C) 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4 index 9486377..114d828 100644 --- a/m4/sys_socket_h.m4 +++ b/m4/sys_socket_h.m4 @@ -1,5 +1,5 @@ # sys_socket_h.m4 serial 23 -dnl Copyright (C) 2005-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2005-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4 index 6dd3d99..eaa7642 100644 --- a/m4/sys_stat_h.m4 +++ b/m4/sys_stat_h.m4 @@ -1,5 +1,5 @@ # sys_stat_h.m4 serial 28 -*- Autoconf -*- -dnl Copyright (C) 2006-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_time_h.m4 b/m4/sys_time_h.m4 index 0ac71ac..5c79300 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-2013 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4 index d15c1b3..9748905 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-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/sysexits.m4 b/m4/sysexits.m4 index bd8abaa..e2b0450 100644 --- a/m4/sysexits.m4 +++ b/m4/sysexits.m4 @@ -1,5 +1,5 @@ # sysexits.m4 serial 6 -dnl Copyright (C) 2003, 2005, 2007, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2005, 2007, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/tempname.m4 b/m4/tempname.m4 index a6e42dc..1594e1f 100644 --- a/m4/tempname.m4 +++ b/m4/tempname.m4 @@ -1,6 +1,6 @@ #serial 5 -# Copyright (C) 2006-2007, 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/time_h.m4 b/m4/time_h.m4 index 3b83900..9852778 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-2013 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 2009-2014 Free Software Foundation, Inc. -# serial 7 +# serial 8 # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -106,4 +106,13 @@ AC_DEFUN([gl_HEADER_TIME_H_DEFAULTS], REPLACE_MKTIME=GNULIB_PORTCHECK; AC_SUBST([REPLACE_MKTIME]) REPLACE_NANOSLEEP=GNULIB_PORTCHECK; AC_SUBST([REPLACE_NANOSLEEP]) REPLACE_TIMEGM=GNULIB_PORTCHECK; AC_SUBST([REPLACE_TIMEGM]) + + dnl Hack so that the time module doesn't depend on the sys_time module. + dnl First, default GNULIB_GETTIMEOFDAY to 0 if sys_time is absent. + : ${GNULIB_GETTIMEOFDAY=0}; AC_SUBST([GNULIB_GETTIMEOFDAY]) + dnl Second, it's OK to not use GNULIB_PORTCHECK for REPLACE_GMTIME + dnl and REPLACE_LOCALTIME, as portability to Solaris 2.6 and earlier + dnl is no longer a big deal. + REPLACE_GMTIME=0; AC_SUBST([REPLACE_GMTIME]) + REPLACE_LOCALTIME=0; AC_SUBST([REPLACE_LOCALTIME]) ]) diff --git a/m4/time_r.m4 b/m4/time_r.m4 index c388a83..7e15600 100644 --- a/m4/time_r.m4 +++ b/m4/time_r.m4 @@ -1,6 +1,6 @@ dnl Reentrant time functions: localtime_r, gmtime_r. -dnl Copyright (C) 2003, 2006-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2006-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/timespec.m4 b/m4/timespec.m4 index 399404b..2ce654f 100644 --- a/m4/timespec.m4 +++ b/m4/timespec.m4 @@ -1,6 +1,6 @@ #serial 15 -# Copyright (C) 2000-2001, 2003-2007, 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2000-2001, 2003-2007, 2009-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/tm_gmtoff.m4 b/m4/tm_gmtoff.m4 index 55e7ea3..486351b 100644 --- a/m4/tm_gmtoff.m4 +++ b/m4/tm_gmtoff.m4 @@ -1,5 +1,5 @@ # tm_gmtoff.m4 serial 3 -dnl Copyright (C) 2002, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/ttyname_r.m4 b/m4/ttyname_r.m4 new file mode 100644 index 0000000..1308fb2 --- /dev/null +++ b/m4/ttyname_r.m4 @@ -0,0 +1,101 @@ +# ttyname_r.m4 serial 9 +dnl Copyright (C) 2010-2014 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_FUNC_TTYNAME_R], +[ + AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + + dnl Persuade Solaris to provide the POSIX compliant declaration of + dnl ttyname_r(). + AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + + AC_CHECK_DECLS_ONCE([ttyname_r]) + if test $ac_cv_have_decl_ttyname_r = no; then + HAVE_DECL_TTYNAME_R=0 + fi + + AC_CHECK_FUNCS([ttyname_r]) + if test $ac_cv_func_ttyname_r = no; then + HAVE_TTYNAME_R=0 + else + HAVE_TTYNAME_R=1 + dnl On Mac OS X 10.4 (and Solaris 10 without gl_USE_SYSTEM_EXTENSIONS) + dnl the return type is 'char *', not 'int'. + AC_CACHE_CHECK([whether ttyname_r is compatible with its POSIX signature], + [gl_cv_func_ttyname_r_posix], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include + #include ]], + [[*ttyname_r (0, NULL, 0);]]) + ], + [gl_cv_func_ttyname_r_posix=no], + [gl_cv_func_ttyname_r_posix=yes]) + ]) + if test $gl_cv_func_ttyname_r_posix = no; then + REPLACE_TTYNAME_R=1 + else + AC_DEFINE([HAVE_POSIXDECL_TTYNAME_R], [1], + [Define if the ttyname_r function has a POSIX compliant declaration.]) + dnl On Solaris 10, both ttyname_r functions (the one with the non-POSIX + dnl declaration and the one with the POSIX declaration) refuse to do + dnl anything when the output buffer is less than 128 bytes large. + dnl On OSF/1 5.1, ttyname_r ignores the buffer size and assumes the + dnl buffer is large enough. + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_CACHE_CHECK([whether ttyname_r works with small buffers], + [gl_cv_func_ttyname_r_works], + [ + dnl Initial guess, used when cross-compiling or when /dev/tty cannot + dnl be opened. +changequote(,)dnl + case "$host_os" in + # Guess no on Solaris. + solaris*) gl_cv_func_ttyname_r_works="guessing no" ;; + # Guess no on OSF/1. + osf*) gl_cv_func_ttyname_r_works="guessing no" ;; + # Guess yes otherwise. + *) gl_cv_func_ttyname_r_works="guessing yes" ;; + esac +changequote([,])dnl + AC_RUN_IFELSE( + [AC_LANG_SOURCE([[ +#include +#include +int +main (void) +{ + int result = 0; + int fd; + char buf[31]; /* use any size < 128 here */ + + fd = open ("/dev/tty", O_RDONLY); + if (fd < 0) + result |= 16; + else if (ttyname_r (fd, buf, sizeof (buf)) != 0) + result |= 17; + else if (ttyname_r (fd, buf, 1) == 0) + result |= 18; + return result; +}]])], + [gl_cv_func_ttyname_r_works=yes], + [case $? in + 17 | 18) gl_cv_func_ttyname_r_works=no ;; + esac], + [:]) + ]) + case "$gl_cv_func_ttyname_r_works" in + *yes) ;; + *) REPLACE_TTYNAME_R=1 ;; + esac + fi + fi +]) + +# Prerequisites of lib/ttyname_r.c. +AC_DEFUN([gl_PREREQ_TTYNAME_R], [ + AC_CHECK_FUNCS([ttyname]) +]) diff --git a/m4/unistd-safer.m4 b/m4/unistd-safer.m4 index e65c3c9..96cb7df 100644 --- a/m4/unistd-safer.m4 +++ b/m4/unistd-safer.m4 @@ -1,5 +1,5 @@ #serial 9 -dnl Copyright (C) 2002, 2005-2006, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002, 2005-2006, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4 index 32dcfa5..1fa197e 100644 --- a/m4/unistd_h.m4 +++ b/m4/unistd_h.m4 @@ -1,5 +1,5 @@ -# unistd_h.m4 serial 66 -dnl Copyright (C) 2006-2013 Free Software Foundation, Inc. +# unistd_h.m4 serial 67 +dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -160,6 +160,7 @@ AC_DEFUN([gl_UNISTD_H_DEFAULTS], REPLACE_FTRUNCATE=0; AC_SUBST([REPLACE_FTRUNCATE]) REPLACE_GETCWD=0; AC_SUBST([REPLACE_GETCWD]) REPLACE_GETDOMAINNAME=0; AC_SUBST([REPLACE_GETDOMAINNAME]) + REPLACE_GETDTABLESIZE=0; AC_SUBST([REPLACE_GETDTABLESIZE]) REPLACE_GETLOGIN_R=0; AC_SUBST([REPLACE_GETLOGIN_R]) REPLACE_GETGROUPS=0; AC_SUBST([REPLACE_GETGROUPS]) REPLACE_GETPAGESIZE=0; AC_SUBST([REPLACE_GETPAGESIZE]) diff --git a/m4/unlink.m4 b/m4/unlink.m4 index b6b99d1..03cf8ae 100644 --- a/m4/unlink.m4 +++ b/m4/unlink.m4 @@ -1,5 +1,5 @@ # unlink.m4 serial 11 -dnl Copyright (C) 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/unlinkat.m4 b/m4/unlinkat.m4 index 32cfbc1..f5110aa 100644 --- a/m4/unlinkat.m4 +++ b/m4/unlinkat.m4 @@ -1,5 +1,5 @@ # unlinkat.m4 serial 2 -dnl Copyright (C) 2004-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/unlinkdir.m4 b/m4/unlinkdir.m4 index b555fc9..99797af 100644 --- a/m4/unlinkdir.m4 +++ b/m4/unlinkdir.m4 @@ -1,6 +1,6 @@ # serial 7 -# Copyright (C) 2005-2007, 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2005-2007, 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/unlocked-io.m4 b/m4/unlocked-io.m4 index f146206..6a1dec2 100644 --- a/m4/unlocked-io.m4 +++ b/m4/unlocked-io.m4 @@ -1,6 +1,6 @@ # unlocked-io.m4 serial 15 -# Copyright (C) 1998-2006, 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 1998-2006, 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/m4/unlockpt.m4 b/m4/unlockpt.m4 new file mode 100644 index 0000000..8a96e6b --- /dev/null +++ b/m4/unlockpt.m4 @@ -0,0 +1,23 @@ +# unlockpt.m4 serial 2 +dnl Copyright (C) 2010-2014 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_FUNC_UNLOCKPT], +[ + AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + + dnl Persuade glibc to declare unlockpt(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + + AC_CHECK_FUNCS([unlockpt]) + if test $ac_cv_func_unlockpt = no; then + HAVE_UNLOCKPT=0 + fi +]) + +# Prerequisites of lib/unlockpt.c. +AC_DEFUN([gl_PREREQ_UNLOCKPT], [ + AC_CHECK_FUNCS([revoke]) +]) diff --git a/m4/utimbuf.m4 b/m4/utimbuf.m4 index 3c9df41..822a063 100644 --- a/m4/utimbuf.m4 +++ b/m4/utimbuf.m4 @@ -1,6 +1,6 @@ # serial 9 -# Copyright (C) 1998-2001, 2003-2004, 2007, 2009-2013 Free Software Foundation, +# Copyright (C) 1998-2001, 2003-2004, 2007, 2009-2014 Free Software Foundation, # Inc. # # This file is free software; the Free Software Foundation diff --git a/m4/utimens.m4 b/m4/utimens.m4 index 10fe2a6..c9c44cf 100644 --- a/m4/utimens.m4 +++ b/m4/utimens.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2003-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/utimensat.m4 b/m4/utimensat.m4 index 396b835..9cb97c9 100644 --- a/m4/utimensat.m4 +++ b/m4/utimensat.m4 @@ -1,7 +1,7 @@ # serial 5 # See if we need to provide utimensat replacement. -dnl Copyright (C) 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/utimes.m4 b/m4/utimes.m4 index f8b1928..c361357 100644 --- a/m4/utimes.m4 +++ b/m4/utimes.m4 @@ -1,7 +1,7 @@ # Detect some bugs in glibc's implementation of utimes. # serial 3 -dnl Copyright (C) 2003-2005, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2005, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/vasnprintf.m4 b/m4/vasnprintf.m4 index d730e43..106192e 100644 --- a/m4/vasnprintf.m4 +++ b/m4/vasnprintf.m4 @@ -1,5 +1,5 @@ # vasnprintf.m4 serial 36 -dnl Copyright (C) 2002-2004, 2006-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2006-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/vasprintf.m4 b/m4/vasprintf.m4 index c214ff1..c76c99c 100644 --- a/m4/vasprintf.m4 +++ b/m4/vasprintf.m4 @@ -1,5 +1,5 @@ # vasprintf.m4 serial 6 -dnl Copyright (C) 2002-2003, 2006-2007, 2009-2013 Free Software Foundation, +dnl Copyright (C) 2002-2003, 2006-2007, 2009-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, diff --git a/m4/version-etc.m4 b/m4/version-etc.m4 index 5dbef8e..667f9f8 100644 --- a/m4/version-etc.m4 +++ b/m4/version-etc.m4 @@ -1,5 +1,5 @@ # version-etc.m4 serial 1 -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. diff --git a/m4/vsnprintf.m4 b/m4/vsnprintf.m4 index 4900764..07f739d 100644 --- a/m4/vsnprintf.m4 +++ b/m4/vsnprintf.m4 @@ -1,5 +1,5 @@ # vsnprintf.m4 serial 6 -dnl Copyright (C) 2002-2004, 2007-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2004, 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/warn-on-use.m4 b/m4/warn-on-use.m4 index e43beeb..cc690f8 100644 --- a/m4/warn-on-use.m4 +++ b/m4/warn-on-use.m4 @@ -1,5 +1,5 @@ # warn-on-use.m4 serial 5 -dnl Copyright (C) 2010-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2010-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/warnings.m4 b/m4/warnings.m4 index 1848732..43156f4 100644 --- a/m4/warnings.m4 +++ b/m4/warnings.m4 @@ -1,5 +1,5 @@ -# warnings.m4 serial 8 -dnl Copyright (C) 2008-2013 Free Software Foundation, Inc. +# warnings.m4 serial 11 +dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -25,15 +25,24 @@ m4_ifdef([AS_VAR_APPEND], AC_DEFUN([gl_COMPILER_OPTION_IF], [AS_VAR_PUSHDEF([gl_Warn], [gl_cv_warn_[]_AC_LANG_ABBREV[]_$1])dnl AS_VAR_PUSHDEF([gl_Flags], [_AC_LANG_PREFIX[]FLAGS])dnl +AS_LITERAL_IF([$1], + [m4_pushdef([gl_Positive], m4_bpatsubst([$1], [^-Wno-], [-W]))], + [gl_positive="$1" +case $gl_positive in + -Wno-*) gl_positive=-W`expr "X$gl_positive" : 'X-Wno-\(.*\)'` ;; +esac +m4_pushdef([gl_Positive], [$gl_positive])])dnl AC_CACHE_CHECK([whether _AC_LANG compiler handles $1], m4_defn([gl_Warn]), [ gl_save_compiler_FLAGS="$gl_Flags" - gl_AS_VAR_APPEND(m4_defn([gl_Flags]), [" $gl_unknown_warnings_are_errors $1"]) - AC_COMPILE_IFELSE([m4_default([$4], [AC_LANG_PROGRAM([])])], - [AS_VAR_SET(gl_Warn, [yes])], - [AS_VAR_SET(gl_Warn, [no])]) + gl_AS_VAR_APPEND(m4_defn([gl_Flags]), + [" $gl_unknown_warnings_are_errors ]m4_defn([gl_Positive])["]) + AC_LINK_IFELSE([m4_default([$4], [AC_LANG_PROGRAM([])])], + [AS_VAR_SET(gl_Warn, [yes])], + [AS_VAR_SET(gl_Warn, [no])]) gl_Flags="$gl_save_compiler_FLAGS" ]) AS_VAR_IF(gl_Warn, [yes], [$2], [$3]) +m4_popdef([gl_Positive])dnl AS_VAR_POPDEF([gl_Flags])dnl AS_VAR_POPDEF([gl_Warn])dnl ]) diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4 index bedb15a..85db952 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-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4 index e1e1e69..839a04c 100644 --- a/m4/wchar_t.m4 +++ b/m4/wchar_t.m4 @@ -1,5 +1,5 @@ # wchar_t.m4 serial 4 (gettext-0.18.2) -dnl Copyright (C) 2002-2003, 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2003, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wcrtomb.m4 b/m4/wcrtomb.m4 index f56b5ba..844ef6a 100644 --- a/m4/wcrtomb.m4 +++ b/m4/wcrtomb.m4 @@ -1,5 +1,5 @@ # wcrtomb.m4 serial 11 -dnl Copyright (C) 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wctype_h.m4 b/m4/wctype_h.m4 index 82ada0e..3fac0ee 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-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4 index 740f81e..f00a6cc 100644 --- a/m4/wcwidth.m4 +++ b/m4/wcwidth.m4 @@ -1,5 +1,5 @@ # wcwidth.m4 serial 23 -dnl Copyright (C) 2006-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2006-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/wint_t.m4 b/m4/wint_t.m4 index d7cd3db..9b07b07 100644 --- a/m4/wint_t.m4 +++ b/m4/wint_t.m4 @@ -1,5 +1,5 @@ # wint_t.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2003, 2007-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2007-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/write.m4 b/m4/write.m4 index a79b2cc..820dd4f 100644 --- a/m4/write.m4 +++ b/m4/write.m4 @@ -1,5 +1,5 @@ # write.m4 serial 5 -dnl Copyright (C) 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xalloc.m4 b/m4/xalloc.m4 index 64ca701..b6a2257 100644 --- a/m4/xalloc.m4 +++ b/m4/xalloc.m4 @@ -1,5 +1,5 @@ # xalloc.m4 serial 18 -dnl Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xgetcwd.m4 b/m4/xgetcwd.m4 index c972029..c6057fd 100644 --- a/m4/xgetcwd.m4 +++ b/m4/xgetcwd.m4 @@ -1,5 +1,5 @@ #serial 8 -dnl Copyright (C) 2002-2006, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xsize.m4 b/m4/xsize.m4 index 8ea9f2c..3af23ec 100644 --- a/m4/xsize.m4 +++ b/m4/xsize.m4 @@ -1,5 +1,5 @@ # xsize.m4 serial 5 -dnl Copyright (C) 2003-2004, 2008-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2003-2004, 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xstrndup.m4 b/m4/xstrndup.m4 index 4a9330b..8521f0e 100644 --- a/m4/xstrndup.m4 +++ b/m4/xstrndup.m4 @@ -1,5 +1,5 @@ # xstrndup.m4 serial 2 -dnl Copyright (C) 2003, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xstrtol.m4 b/m4/xstrtol.m4 index d52ee11..03419d8 100644 --- a/m4/xstrtol.m4 +++ b/m4/xstrtol.m4 @@ -1,5 +1,5 @@ #serial 11 -dnl Copyright (C) 2002-2007, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2007, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/m4/xvasprintf.m4 b/m4/xvasprintf.m4 index 772dcc8..c2d3ec7 100644 --- a/m4/xvasprintf.m4 +++ b/m4/xvasprintf.m4 @@ -1,5 +1,5 @@ # xvasprintf.m4 serial 2 -dnl Copyright (C) 2006, 2009-2013 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff --git a/po/LINGUAS b/po/LINGUAS index c892523..95cf005 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -29,6 +29,7 @@ ro ru sk sl +sr sv tr uk diff --git a/po/POTFILES.in b/po/POTFILES.in index 878910d..d5439ad 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,6 @@ # List of files which contain translatable strings. -# Copyright 1996, 1999-2000, 2003-2005, 2007, 2013 Free Software +# Copyright 1996, 1999-2000, 2003-2005, 2007, 2013-2014 Free Software # Foundation, Inc. # This file is part of GNU tar. diff --git a/po/bg.gmo b/po/bg.gmo index bbcf2e8..fc07246 100644 Binary files a/po/bg.gmo and b/po/bg.gmo differ diff --git a/po/bg.po b/po/bg.po index 73875c9..fbb4ae2 100644 --- a/po/bg.po +++ b/po/bg.po @@ -9,12 +9,12 @@ # This file should be sent to translation@iro.umontreal.ca with the # following subject line: TP-Robot tar-1.16.bg.po # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" "Project-Id-Version: tar 1.16\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" "PO-Revision-Date: 2006-11-23 22:40+0200\n" "Last-Translator: Anton Zinoviev \n" "Language-Team: Bulgarian \n" @@ -107,7 +107,7 @@ msgstr "показва тази Ñправка" msgid "give a short usage message" msgstr "показва кратко Ñъобщение за използването" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "ИМЕ" @@ -398,8 +398,8 @@ msgstr "" #, fuzzy, c-format msgid "Report %s bugs to: %s\n" msgstr "" -"\n" -"Съобщавайте за програмни грешки на <%s>.\n" +"Съобщавайте за програмни грешки на %s.\n" +"За грешки в българÑÐºÐ¸Ñ Ð¿Ñ€ÐµÐ²Ð¾Ð´ на .\n" #: gnu/version-etc.c:253 #, c-format @@ -419,7 +419,7 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: ФункциÑта %s не уÑпÑ" @@ -428,34 +428,34 @@ msgstr "%s: ФункциÑта %s не уÑпÑ" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: Внимание: ФункциÑта %s не уÑпÑ" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: Режимът за доÑтъп не може да Ñе Ñмени на %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: СобÑтвеноÑтта не може да Ñе Ñмени на потребител %lu, група %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: Ðе може да Ñе направи твърда връзка Ñ %s" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Грешка при четене при байт %s, при четенето на %lu байт" msgstr[1] "%s: Грешка при четене при байт %s, при четенето на %lu байта" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" @@ -464,22 +464,22 @@ msgstr[0] "" msgstr[1] "" "%s: Внимание: Грешка при четене при байт %s, при четенето на %lu байта" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: Ðе може да Ñе отиде на отмеÑтване %s във файла" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: Внимание: Ðе може да Ñе отиде на отмеÑтване %s във файла" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: Ðе може да Ñе направи Ñимволна връзка към %s" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -585,8 +585,8 @@ msgstr "Ðеочакван EOF" msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "N" @@ -594,10 +594,10 @@ msgstr "N" msgid "set debug level" msgstr "" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "ФÐЙЛ" @@ -619,105 +619,113 @@ msgstr "твърде много аргументи" msgid "Garbage command" msgstr "Ðепозната команда" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Това не прилича на tar-архив" -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" -msgstr "Общо запиÑани байтове" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" msgstr "Общо прочетени байтове" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "Общо запиÑани байтове" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Общо изтрити байтове: %s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(канал)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "Ðеправилна ÑтойноÑÑ‚ на record_size" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Ðе е поÑочено име на архив" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Ðе може да Ñе проверÑват архиви на Ñтандартните вход/изход" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Ðрхивът е компреÑиран. Използвайте опциÑта %s" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Ðе може да Ñе актуализират компреÑирани архиви" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "Ð’ началото на лентата, край на изпълнението" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "Твърде много грешки, край на изпълнението" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Размер на запиÑа = %lu блок" msgstr[1] "Размер на запиÑа = %lu блока" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "Ðеподравнен блок (%lu байт) в архива" msgstr[1] "Ðеподравнен блок (%lu байта) в архива" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" "Ðевъзможно е връщане назад в Ð°Ñ€Ñ…Ð¸Ð²Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»; той може да е нечитаем без Ð¾Ð¿Ñ†Ð¸Ñ " "-i" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek не завърши при граница на запиÑ" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: Ñъдържа неправилен номер на том" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "Препълване на номера на том" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Подгответе том â„–%d за %s и натиÑнете return: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "EOF, когато Ñе очакваше отговор от потребителÑ" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "Ð’ÐИМÐÐИЕ: Ðрхивът е незавършен" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -729,66 +737,66 @@ msgstr "" " q ПрекратÑва tar\n" " y или return Продължава изпълнението\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Поражда вторична командна обвивка\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? Извежда този ÑпиÑък\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "ÐÑма повече томове; изход.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "Ðе е поÑочено име на файл. Опитайте отново.\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Ðеправилна команда. Използвайте ? за Ñправка.\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "командата %s не уÑпÑ" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" "%s вероÑтно продължава в този том: заглавниÑÑ‚ Ð·Ð°Ð¿Ð¸Ñ Ñъдържа отрÑзано име" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s не продължава Ñ Ñ‚Ð¾Ð·Ð¸ том" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s е грешен размер (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Този том е извън поредицата" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "Ðрхивът не е етикетиран да Ð¾Ñ‚Ð³Ð¾Ð²Ð°Ñ€Ñ Ð½Ð° %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "Томът %s не ÑъответÑтва на %s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -796,7 +804,7 @@ msgstr "" "%s: името на файла е твърде дълго, за да Ñе побере в заглавен Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° " "многотомен ГÐУ-архив и бе Ñъкратено" -#: src/buffer.c:1866 +#: src/buffer.c:1917 #, fuzzy msgid "write did not end on a block boundary" msgstr "EOF на архив %s не е на границата на блок" @@ -808,16 +816,16 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Само %lu от %lu байт можаха да Ñе прочетат" msgstr[1] "Само %lu от %lu байта можаха да Ñе прочетат" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "Съдържанието Ñе различава" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "Ðеочакван знак за край (EOF) в архива" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "Файловите типове Ñе различават" @@ -837,7 +845,7 @@ msgstr "Групите Ñе различават" msgid "Mod time differs" msgstr "Времената на промÑна Ñе различават" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Размерите Ñе различават" @@ -854,37 +862,37 @@ msgstr "Символните връзки Ñе различават" msgid "Device number differs" msgstr "Ðомерата на уÑтройÑтво Ñе различават" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Проверка" -#: src/compare.c:471 +#: src/compare.c:473 #, fuzzy, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "%s: Ðепознат файлов тип „%c“, ÑравнÑва Ñе като обикновен файл" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "Ðрхивът Ñъдържа файлови имена, Ñ Ð¾Ñ‚Ñтранени префикÑи." -#: src/compare.c:533 +#: src/compare.c:535 #, fuzzy msgid "Archive contains transformed file names." msgstr "Ðрхивът Ñъдържа архаични заглавни запиÑи по модул 64 (6 битови)" -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "Проверката може и да не открие оригиналните файлове." -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "ÐЕУСПЕШÐРПРОВЕРКÐ: открита е %d неправилен заглавен запиÑ" msgstr[1] "ÐЕУСПЕШÐРПРОВЕРКÐ: открити Ñа %d неправилни заглавни запиÑа" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "Изолиран блок от нули при %s" @@ -932,56 +940,56 @@ msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "%s: Файлът Ð½Ð°Ð¼Ð°Ð»Ñ Ñ %s байт; допълва Ñе Ñ Ð½ÑƒÐ»Ð°" msgstr[1] "%s: Файлът Ð½Ð°Ð¼Ð°Ð»Ñ Ñ %s байта; допълва Ñе Ñ Ð½ÑƒÐ»Ð¸" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: файлът е в друга файлова ÑиÑтема; не Ñе архивира" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Ðепознат файлов тип; файлът Ñе пренебрегва" -#: src/create.c:1549 +#: src/create.c:1551 #, fuzzy, c-format msgid "Missing links to %s." msgstr "Ðеархивирани връзки Ñ %s.\n" -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: файлът не е променен; не Ñе архивира" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: файлът е архив; не Ñе архивира" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 #, fuzzy msgid "directory not dumped" msgstr "%s: каталогът е обозначен като кеш; не Ñе архивира" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: файлът бе изменен по време на четене" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: гнездото Ñе пренебрегва" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: пренебрегва Ñе ÑпециалниÑÑ‚ файл тип door" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "ПропуÑка Ñе до ÑÐ»ÐµÐ´Ð²Ð°Ñ‰Ð¸Ñ Ð·Ð°Ð³Ð»Ð°Ð²ÐµÐ½ запиÑ" @@ -1028,7 +1036,7 @@ msgstr "Опитва Ñе извличането на Ñимволни връз msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Ðе може да Ñе извлича -- файлът продължава Ñ Ð´Ñ€ÑƒÐ³ том" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" msgstr "Ðеочаквано дълъг заглавен запиÑ" @@ -1072,155 +1080,155 @@ msgstr "%s: файлът е в друга файлова ÑиÑтема; не Ñ msgid "%s: Directory has been renamed" msgstr "%s: Каталогът бе преименуван" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "ЗапиÑано е неправилно време" -#: src/incremen.c:1045 +#: src/incremen.c:1047 #, fuzzy msgid "Invalid modification time" msgstr "Ðеправилно време на промÑна (Ñекунди)" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "Ðеправилно време на промÑна (наноÑекунди)" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "Ðеправилен номер на уÑтройÑтво" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Ðеправилен номер на i-възел" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" msgstr "" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" msgstr "Ðеочакван край на snapshot-файл" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" msgstr "" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" msgstr "" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "ЛипÑва завършител на запиÑа" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "Грешен инкрементален файлов формат" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "Ðеподдържана верÑÐ¸Ñ Ð½Ð° инкрементален формат: %" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Лошо формиран dumpdir: очаква Ñе „%c“, а вмеÑто това има %#3o" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Лошо формиран dumpdir: „X“ е дублиран" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Лошо формиран dumpdir: празно име в „R“" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Лошо формиран dumpdir: „T“ не Ñе предхожда от „R“" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Лошо формиран dumpdir: празно име в „T“" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "Лошо формиран dumpdir: очаква Ñе „%c“, вмеÑто това данните Ñвършват" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "Лошо формиран dumpdir: „X“ никога не Ñе използва" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Ðе може да Ñе Ñъздаде временен каталог, използвайки шаблона %s" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Каталогът не Ñе изчиÑтва: не може да Ñе доÑтъпи" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: каталогът е на друго уÑтройÑтво: не Ñе изчиÑтва" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Изтрива Ñе %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: Ðе може да Ñе изтрие" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: ПропуÑка Ñе" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "блок %s: ** Блок от знаци NUL **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "блок %s: ** Край на файла **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "блок %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Интервали в заглавен Ð·Ð°Ð¿Ð¸Ñ Ð²Ð¼ÐµÑто чиÑлова ÑтойноÑÑ‚ на %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1228,97 +1236,97 @@ msgstr "" "е допълнение до две" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "ОÑмичната ÑтойноÑÑ‚ %.*s в архива е извън диапазона за %s" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "Ðрхивът Ñъдържа архаични заглавни запиÑи по модул 64 (6 битови)" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" "Ðрхивът е подпиÑан Ñ Ð½Ð¸Ð· по модул 64 %s, който е е извън диапазона за %s" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "СтойноÑтта по модул 256 в архива е извън диапазона %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Ðрхивът Ñъдържа %.*s, вмеÑто това Ñе очаква чиÑлова ÑтойноÑÑ‚ на %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "СтойноÑтта %s в архива е извън допуÑÑ‚Ð¸Ð¼Ð¸Ñ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½ за %s (%s..%s)" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " връзка към %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " непознат файлов тип %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--Дълга връзка--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--Дълго име--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Заглавен Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° тома--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Продължава при байт %s--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Създава Ñе каталог:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "Преименува Ñе %s на %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Ðе може да Ñе преименува на %s" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "Преименува Ñе %s обратно на %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Файлът бе изтрит преди да бъде прочетен" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "породен процеÑ" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "междупроцеÑен канал" @@ -1332,7 +1340,7 @@ msgstr "командата %s не уÑпÑ" msgid "%s: file list requested from %s already read from %s" msgstr "%s: файловиÑÑ‚ ÑпиÑък вече е прочетен" -#: src/names.c:448 +#: src/names.c:448 src/checkpoint.c:274 #, fuzzy, c-format msgid "cannot split string '%s': %s" msgstr "не може да Ñе Ñмени времето на „%s“" @@ -1342,57 +1350,57 @@ msgstr "не може да Ñе Ñмени времето на „%s“" msgid "%s: file name read contains nul character" msgstr "%s: файловото име Ñъдържа нулев байт" -#: src/names.c:821 +#: src/names.c:824 #, fuzzy msgid "Pattern matching characters used in file names" msgstr "Във файловите имена Ñа използвани „*“ и „?“. МолÑ," -#: src/names.c:823 +#: src/names.c:826 #, fuzzy msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "използвайте --wildcards, за да позволите ÑъпоÑтавÑне Ñ Ð¾Ð±Ñ€Ð°Ð·Ñ†Ð¸," -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: Ðе е открит в архива" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Ðеобходимо Ñрещане не е открито в архива" -#: src/names.c:876 +#: src/names.c:879 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "Ðрхивът не е етикетиран да Ð¾Ñ‚Ð³Ð¾Ð²Ð°Ñ€Ñ Ð½Ð° %s" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "И двете опции „-%s“ и „-%s“ изиÑкват Ñтандартен вход" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s: Ðеправилен архивен формат" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "ПоиÑкани Ñа ГÐУ-възможноÑти при неÑъвмеÑтим архивен формат" -#: src/tar.c:255 +#: src/tar.c:264 #, fuzzy, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." @@ -1400,7 +1408,7 @@ msgstr "" "Ðепознат начин за извеждане на Ñпец. знаци „%s“. Използвайте „%s --quoting-" "style=help“, за да получите ÑпиÑък." -#: src/tar.c:364 +#: src/tar.c:378 #, fuzzy msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " @@ -1420,7 +1428,7 @@ msgstr "" "tar\n" " tar -xf архив.tar # Извлича от архив.tar вÑички файлове\n" -#: src/tar.c:373 +#: src/tar.c:387 #, fuzzy msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1443,79 +1451,79 @@ msgstr "" "иначе\n" " never, simple винаги да Ñе правÑÑ‚ проÑти резервни копиÑ\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "Вид оÑновно дейÑтвие:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "изрежда Ñъдържанието на архив" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "извлича файлове от архива" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "Ñъздава нов архив" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "намира разликите между архива и файловата ÑиÑтема" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "Ð´Ð¾Ð±Ð°Ð²Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ðµ в ÐºÑ€Ð°Ñ Ð½Ð° архив" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "Ð´Ð¾Ð±Ð°Ð²Ñ Ñамо файлове, по-нови от копието в архива" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "Ð¿Ñ€Ð¸Ð±Ð°Ð²Ñ tar-файлове към архива" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "трие файлове от архива (не при магнитни ленти!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "проверÑва етикета на тома и завършва" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "Модификатори на дейÑтвието:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "работи ефективно Ñ Ñ€Ð°Ð·Ñ€ÐµÐ´ÐµÐ½Ð¸ файлове" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "ГОЛЯМ[.ÐœÐЛЪК]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ñ Ð²ÐµÑ€ÑиÑта на формата разредени файлове (влече --sparse)" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "ÑÑŠÑ Ñтар формат ГÐУ за инкрементално архивиране" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "Ñ Ð½Ð¾Ð²Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚ на ГÐУ за инкрем. архивиране" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "при нечитаеми файлове не завършва Ñ Ð³Ñ€ÐµÑˆÐºÐ°" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1527,133 +1535,141 @@ msgstr "" "list и когато ÑпиÑъкът от файлове е зададен или на ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¸Ñ Ñ€ÐµÐ´, или Ñ " "Ð¾Ð¿Ñ†Ð¸Ñ -T. Ðко не е поÑочен N, Ñе подразбира 1." -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "архивът е Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð»ÐµÐ½ доÑтъп" -#: src/tar.c:453 +#: src/tar.c:467 #, fuzzy msgid "archive is not seekable" msgstr "архивът е Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð»ÐµÐ½ доÑтъп" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "Регулиране замеÑтването на файлове:" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "Ñлед запиÑа опитва да провери архива" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "изтрива файловете Ñлед като ги добави в архива" -#: src/tar.c:471 +#: src/tar.c:485 #, fuzzy msgid "don't replace existing files when extracting, treat them as errors" msgstr "при извличане не замеÑтва ÑъщеÑтвуващи файлове" -#: src/tar.c:474 +#: src/tar.c:488 #, fuzzy msgid "don't replace existing files when extracting, silently skip over them" msgstr "при извличане не замеÑтва ÑъщеÑтвуващи файлове" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "" "не замеÑтва ÑъщеÑтвуващи файлове, ако Ñа по-нови от копиÑта им в архива" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "при извличане замеÑтва ÑъщеÑтвуващи файлове" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "изтрива вÑеки файл преди да извлича върху него" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "изпразва йерархиÑта преди извличане на каталог" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "запазва метаданните на ÑъщеÑтвуващи каталози" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "при извличане замеÑтва метаданните на ÑъщеÑтвуващи каталози (подразбира Ñе)" -#: src/tar.c:490 +#: src/tar.c:504 #, fuzzy msgid "preserve existing symlinks to directories when extracting" msgstr "при извличане замеÑтва ÑъщеÑтвуващи файлове" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "КÐТ" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "Избор на изходен поток:" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "извлича файловете на ÑÑ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð¸Ñ Ð¸Ð·Ñ…Ð¾Ð´" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "КОМÐÐДÐ" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "подава Ñ ÐºÐ°Ð½Ð°Ð» вÑеки извлечен файл към КОМÐÐДÐ" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "игнорира кода на завършване на породени процеÑи" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "Ñчита за грешка вÑеки ненулев код на завършване на породен процеÑ" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Подход ÑпрÑмо файловите атрибути:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "прави ИМЕ да е ÑобÑтвеник на добавените файлове" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "прави ИМЕ да бъде групата на добавените файлове" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "ДÐТÐ-ИЛИ-ФÐЙЛ" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "прави времето на промÑна на добавÑни файлове като ДÐТÐ-ИЛИ-ФÐЙЛ" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "ПРОМЕÐИ" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "модифицира режима за доÑтъп на добавени файлове" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "МЕТОД" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " @@ -1663,33 +1679,33 @@ msgstr "" "времената Ñлед четене (при МЕТОД=„replace“, подразбира Ñе), или не Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ñ " "имената изобщо (МЕТОД=„system“)" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "не извлича времето на промÑна на файловете" -#: src/tar.c:528 +#: src/tar.c:545 #, fuzzy msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" msgstr "опитва да възÑтановÑва ÑобÑтвеноÑтта на файловете" -#: src/tar.c:530 +#: src/tar.c:547 #, fuzzy msgid "extract files as yourself (default for ordinary users)" msgstr "извлича файловете от ваше име" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "използва чиÑла вмеÑто имена за потребител и група" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" "възÑтановÑва точно (без umask) режима на доÑтъп (подразбира Ñе при " "привилегирован потребител)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1697,16 +1713,16 @@ msgstr "" "прилага umask на Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð¸Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¸ извличане на файлове (подразбира Ñе при " "обикновен потребител)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "Ñъщото като едновременно -p и -s" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1714,180 +1730,188 @@ msgstr "" "Ð·Ð°Ð±Ð°Ð²Ñ Ð½Ð°Ñтройката на времето на промÑна и режима за доÑтъп на извличаните " "каталози докато извличането завърши" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "Ð¾Ñ‚Ð¼ÐµÐ½Ñ ÐµÑ„ÐµÐºÑ‚Ð° на --delay-directory-restore" -#: src/tar.c:554 +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 #, fuzzy msgid "Handling of extended file attributes:" msgstr "Подход ÑпрÑмо файловите атрибути:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" msgstr "" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" msgstr "" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" msgstr "" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" msgstr "" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" msgstr "" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" msgstr "" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" msgstr "" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" msgstr "" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "Избор на уÑтройÑтво и ÑмÑна:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ÐРХИВ" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "използва Ð°Ñ€Ñ…Ð¸Ð²Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð» или уÑтройÑтво ÐРХИВ" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "архивниÑÑ‚ файл е локален дори при двуеточие" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "използва поÑочената КОМÐÐДРвмеÑто rmt" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "използва поÑочената КОМÐÐДРвмеÑто rsh" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "поÑочва уÑтройÑтво и гъÑтота" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "Ñъздава/извежда/извлича многотомен архив" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "ÑмÑна на лентата Ñлед Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° 1024 x N байта" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "изпълнÑва Ñкрипт в ÐºÑ€Ð°Ñ Ð½Ð° вÑÑка лента (влече -M)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "ползва от и обновÑва във ФÐЙЛ номера на тома" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "Блокуване на уÑтройÑтвото:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "БЛОКОВЕ" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "БЛОКОВЕ x 512 байта в Ñекунда" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "прави N-байтови запиÑи, кратно на 512" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "пренебрегва блоковете от нули и продължава" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "преформира при четене блоковете (канали 4.2BSD)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "Избор на архивен формат:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "ФОРМÐТ" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "Ñъздава архив Ñ Ð¿Ð¾ÑÐ¾Ñ‡ÐµÐ½Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "ФОРМÐТ е нÑкой от Ñледните:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "Ñтар формат tar, V7" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "формат на ГÐУ при tar <= 1.12" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "формат на верÑÐ¸Ñ 1.13.x на tar на ГÐУ" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "формат POSIX 1003.1-1988 (ustar)" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "формат POSIX 1003.1-2001 (pax)" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "Ñъщото като pax" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "Ñъщото като --format=v7" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "Ñъщото като --format=posix" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "ключдума[[:]=ÑтойноÑÑ‚][,ключдума[[:]=ÑтойноÑÑ‚]]..." -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "управлÑващи ключови думи за pax" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "ТЕКСТ" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1895,178 +1919,190 @@ msgstr "" "Ñъздава архив Ñ Ð¸Ð¼Ðµ на том ТЕКСТ; при извеждане или извличане ÑравнÑва името " "на тома Ñ Ð¢Ð•ÐšÐ¡Ð¢" -#: src/tar.c:660 +#: src/tar.c:684 #, fuzzy msgid "Compression options:" msgstr "Противоречащи Ñи опции за компреÑиране" -#: src/tar.c:662 +#: src/tar.c:686 #, fuzzy msgid "use archive suffix to determine the compression program" msgstr "Ðе може да Ñе пише към компреÑиращата програма" -#: src/tar.c:664 +#: src/tar.c:688 #, fuzzy msgid "do not use archive suffix to determine the compression program" msgstr "Ðе може да Ñе пише към компреÑиращата програма" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "ПРОГ" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "прекарва архива през ПРОГ (Ñ‚Ñ€Ñбва да приема -d)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "Избор на локален файл:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" "Ð´Ð¾Ð±Ð°Ð²Ñ Ð¿Ð¾ÑÐ¾Ñ‡ÐµÐ½Ð¸Ñ Ð¤ÐЙЛ към архива (полезно е, ако името му започва Ñ Ð¼Ð¸Ð½ÑƒÑ)" -#: src/tar.c:687 -msgid "DIR" -msgstr "КÐТ" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "работи в каталога КÐТ" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "взема имената за извличане или Ñъздаване от ФÐЙЛ" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "-T чете имена, завършващи Ñ Ð½ÑƒÐ»ÐµÐ² байт" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" msgstr "декодира „\\“ във файловите имена на -T (подразб.)" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" msgstr "не декодира „\\“ във файловите имена на -T" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "ОБРÐЗЕЦ" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "без файловете, отговарÑщи на ОБРÐЗЕЦ" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "пропуÑка файловете, отговарÑщи на образци в ФÐЙЛ" -#: src/tar.c:704 +#: src/tar.c:728 #, fuzzy msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "без каталози, обозначени като кеширащи" -#: src/tar.c:707 +#: src/tar.c:731 #, fuzzy msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "без каталози, обозначени като кеширащи" -#: src/tar.c:710 +#: src/tar.c:734 #, fuzzy msgid "exclude directories containing CACHEDIR.TAG" msgstr "без каталози, обозначени като кеширащи" -#: src/tar.c:712 +#: src/tar.c:736 #, fuzzy msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "без каталози, обозначени като кеширащи" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 #, fuzzy msgid "exclude everything under directories containing FILE" msgstr "без каталози, обозначени като кеширащи" -#: src/tar.c:717 +#: src/tar.c:747 #, fuzzy msgid "exclude directories containing FILE" msgstr "без каталози, обозначени като кеширащи" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "без автоматично влизане в подкаталозите" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "работи в рамките на локалната файлова ÑиÑтема" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "влиза рекурÑивно в подкаталозите (подразбира Ñе)" -#: src/tar.c:729 +#: src/tar.c:761 #, fuzzy msgid "don't strip leading '/'s from file names" msgstr "не маха „/“ в началото на файлови имена" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "Ñледва Ñимв. връзки; архивира Ñочените файлове" -#: src/tar.c:733 +#: src/tar.c:765 #, fuzzy msgid "follow hard links; archive and dump the files they refer to" msgstr "Ñледва Ñимв. връзки; архивира Ñочените файлове" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "ЧЛЕÐ-ИМЕ" -#: src/tar.c:735 +#: src/tar.c:767 #, fuzzy msgid "begin at member MEMBER-NAME when reading the archive" msgstr "започва от файл Ñ Ð¸Ð¼Ðµ ЧЛЕÐ-ИМЕ в архива" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "ÑъхранÑва Ñамо файлове, по-нови от ДÐТÐ-ИЛИ-ФÐЙЛ" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "ДÐТÐ" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "ÑравнÑва времето Ñамо ако данните Ñа променени" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "МЕТОД" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "резервно копира ÑъщеÑтвуващи файлове Ñ ÐœÐ•Ð¢ÐžÐ”" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "ÐИЗ" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -2075,101 +2111,101 @@ msgstr "" "оÑвен ако не е бил Ñменен Ñ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð»Ð¸Ð²Ð°Ñ‚Ð° от обкръжението " "SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "Промени на файловите имена:" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "при извличане маха N начални каталози от файловите пътеки" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "ИЗРÐЗ" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "" "преобразува файловите имена, използвайки поÑÐ¾Ñ‡ÐµÐ½Ð¸Ñ Ð˜Ð—Ð ÐЗ за замÑна на sed" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "СъпоÑтавÑне Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð²Ð¸ имена (влиÑе и на включващи, и на изключващи образци):" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "пренебрегва разликата между големи/малки букви" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "ÑъпоÑтавÑнето Ñ Ð¾Ð±Ñ€Ð°Ð·Ñ†Ð¸Ñ‚Ðµ започва от началото на файловото име" -#: src/tar.c:767 +#: src/tar.c:799 #, fuzzy msgid "patterns match after any '/' (default for exclusion)" msgstr "ÑъпоÑтавÑнето започва Ñлед кой да е „/“ (подразбира Ñе при изключване)" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "отчита Ñе разликата между малки и големи букви (подразбира Ñе)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "ползва „*“ и „?“ (подразбира Ñе за изключване)" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "доÑловно низово Ñравнение" -#: src/tar.c:775 +#: src/tar.c:807 #, fuzzy msgid "wildcards do not match '/'" msgstr "„/“ не паÑва Ñ â€ž*“ и „?“" -#: src/tar.c:777 +#: src/tar.c:809 #, fuzzy msgid "wildcards match '/' (default for exclusion)" msgstr "„/“ паÑва Ñ â€ž*“ и „?“ (подразб. за изключване)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Извеждане на информациÑ:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "подробно изрежда обработените файлове" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "" -#: src/tar.c:787 +#: src/tar.c:819 #, fuzzy msgid "warning control" msgstr "Регулиране замеÑтването на файлове:" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "извежда напредъка Ñлед вÑеки N-ти Ð·Ð°Ð¿Ð¸Ñ (подразбира Ñе 10)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "Ñъобщава, ако не вÑички твърди връзки Ñа включени" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "СИГÐÐЛ" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2180,36 +2216,36 @@ msgstr "" "извежда текущите байтове при получаване на СИГÐÐЛ. ДопуÑтими СИГÐÐЛи Ñа " "SIGHUP, SIGQUIT, SIGINT, SIGUSR1 и SIGUSR2; имената без SIG Ñъщо Ñа позволени" -#: src/tar.c:802 +#: src/tar.c:834 #, fuzzy msgid "print file modification times in UTC" msgstr "извежда времената по Гринуич" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "изпраща Ð¿Ð¾Ð´Ñ€Ð¾Ð±Ð½Ð¸Ñ Ð¸Ð·Ñ…Ð¾Ð´ във ФÐЙЛ" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "показва номера на блок в архива Ñ Ð²ÑÑко Ñъобщение" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "изиÑква потвърждение за вÑÑко дейÑтвие" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "показва подразбираното от tar" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2217,32 +2253,32 @@ msgstr "" "при извеждане или извличане изрежда вÑеки каталог, който Ñе пропуÑка по " "нÑкаква причина" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "показва преобразуваните файлови имена в архива" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "ÐÐЧИÐ" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "" "начин за цитиране на Ñпециални знаци; вж. по-долу за ÑтойноÑтите на ÐÐЧИÐ" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "работи и ÑÑŠÑ Ð·Ð½Ð°Ñ†Ð¸Ñ‚Ðµ от ÐИЗ като ÑÑŠÑ Ñпециални" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "не работи ÑÑŠÑ Ð·Ð½Ð°Ñ†Ð¸Ñ‚Ðµ от ÐИЗ като ÑÑŠÑ Ñпециални" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "Опции за ÑъвмеÑтимоÑÑ‚:" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2250,56 +2286,56 @@ msgstr "" "при Ñъздаване е Ñъщото като --old-archive; при извличане е Ñъщото като --no-" "same-owner" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "Други опции:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "забранÑва нÑкои потенциално опаÑни опции" -#: src/tar.c:978 +#: src/tar.c:1010 #, fuzzy msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" msgstr "Ðе може да Ñе използва повече от една Ð¾Ð¿Ñ†Ð¸Ñ â€ž-Acdtrux“" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Противоречащи Ñи опции за компреÑиране" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "Ðепознато име на Ñигнал: %s" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "Ðе е открит еталлонниÑÑ‚ файл за дата" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Използва Ñе %s вмеÑто Ð½ÐµÐ¿Ð¾Ð·Ð½Ð°Ñ‚Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² формат за дата %s" -#: src/tar.c:1108 +#: src/tar.c:1140 #, fuzzy, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "ÐžÐ¿Ñ†Ð¸Ñ %s: Датата „%s“ Ñе разглежда като %s" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, fuzzy, c-format msgid "filter the archive through %s" msgstr "прекарва архива през gzip" -#: src/tar.c:1179 +#: src/tar.c:1214 #, fuzzy msgid "Valid arguments for the --quoting-style option are:" msgstr "Правилни аргументи за опциите --quoting-style Ñа:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2307,202 +2343,196 @@ msgstr "" "\n" "*Този* tar подразбира Ñледното:\n" -#: src/tar.c:1295 +#: src/tar.c:1330 #, fuzzy msgid "Invalid owner or group ID" msgstr "Ðеправилен ÑобÑтвеник" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Ðеправилен фактор за блокуване" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "Ðеправилна дължина на лента" -#: src/tar.c:1466 +#: src/tar.c:1521 #, fuzzy msgid "Invalid incremental level value" msgstr "Грешен инкрементален файлов формат" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "Повече от една ограничителна дата" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "Ðеправилна верÑÐ¸Ñ Ð½Ð° формат разредени файлове" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' не Ñе поддържа на тази платформа" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "ÑтойноÑтта на --checkpoint не е цÑло чиÑло" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Ðа Ð¾Ð¿Ñ†Ð¸Ñ Ðµ подаден неправилен режим" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "Ðеправилно чиÑло" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Ðеправилен размер на запиÑ" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "Размерът на Ð·Ð°Ð¿Ð¸Ñ Ñ‚Ñ€Ñбва да е кратен на %d." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "Ðеправилен брой елементи" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "ПозволÑва Ñе Ñамо една Ð¾Ð¿Ñ†Ð¸Ñ --to-command" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "Лошо образуван аргумент за гъÑтота: %s" -#: src/tar.c:2133 +#: src/tar.c:2205 #, fuzzy, c-format msgid "Unknown density: '%c'" msgstr "Ðепозната гъÑтота: „%c“" -#: src/tar.c:2150 +#: src/tar.c:2222 #, fuzzy, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "Опциите „-[0-7][lmh]“ не Ñе поддържат от *този* tar" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[ФÐЙЛ]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 +#, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "Образецът %s не може да Ñе използва" + +#: src/tar.c:2389 #, fuzzy, c-format msgid "Old option '%c' requires an argument." msgstr "Старата Ð¾Ð¿Ñ†Ð¸Ñ â€ž%c“ изиÑква аргумент." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "без ÑпиÑък файлове опциÑта --occurrence е безÑмиÑлена" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "не може да Ñе използва --occurrence при Ð¿Ð¾Ð¶ÐµÐ»Ð°Ð½Ð¸Ñ Ð½Ð°Ñ‡Ð¸Ð½ на работа" - -#: src/tar.c:2408 +#: src/tar.c:2490 #, fuzzy msgid "Multiple archive files require '-M' option" msgstr "Използването на много архивни файлове изиÑква Ð¾Ð¿Ñ†Ð¸Ñ â€ž-M“" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "Ðе може да Ñе Ñъчетават --listed-incremental Ñ --newer" - -#: src/tar.c:2416 +#: src/tar.c:2498 #, fuzzy msgid "--level is meaningless without --listed-incremental" msgstr "без ÑпиÑък файлове опциÑта --occurrence е безÑмиÑлена" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "%s: Етикетът на тома е твърде дълъг (не повече от %lu байт)" msgstr[1] "%s: Етикетът на тома е твърде дълъг (не повече от %lu байта)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Ðе може да Ñе проверÑват многотомни архиви" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Ðе може да Ñе проверÑват компреÑирани архиви" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "Образецът %s не може да Ñе използва" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Ðе може да Ñе използват многотомни компреÑирани архиви" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "Ðе може да Ñе ÑъединÑват компреÑирани архиви" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "" "опциÑта --pax-option може да Ñе използва Ñамо при архиви във формат POSIX" -#: src/tar.c:2478 +#: src/tar.c:2560 #, fuzzy msgid "--acls can be used only on POSIX archives" msgstr "" "опциÑта --pax-option може да Ñе използва Ñамо при архиви във формат POSIX" -#: src/tar.c:2483 +#: src/tar.c:2565 #, fuzzy msgid "--selinux can be used only on POSIX archives" msgstr "" "опциÑта --pax-option може да Ñе използва Ñамо при архиви във формат POSIX" -#: src/tar.c:2488 +#: src/tar.c:2570 #, fuzzy msgid "--xattrs can be used only on POSIX archives" msgstr "" "опциÑта --pax-option може да Ñе използва Ñамо при архиви във формат POSIX" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "Образецът %s не може да Ñе използва" - -#: src/tar.c:2525 -msgid "Volume length cannot be less than record size" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" msgstr "" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" +#: src/tar.c:2630 +msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "Страхлив отказ да Ñе Ñъздава празен архив" -#: src/tar.c:2565 +#: src/tar.c:2669 #, fuzzy msgid "Options '-Aru' are incompatible with '-f -'" msgstr "Опциите „-Aru“ Ñа неÑъвмеÑтими Ñ â€ž-f -“" -#: src/tar.c:2660 +#: src/tar.c:2766 #, fuzzy msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" msgstr "ТрÑбва да поÑочите поне една от опциите „-Acdtrux“" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" @@ -2510,54 +2540,54 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: Файлът Ð½Ð°Ð¼Ð°Ð»Ñ Ñ %s байт" msgstr[1] "%s: Файлът Ð½Ð°Ð¼Ð°Ð»Ñ Ñ %s байта" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "Ключовата дума %s е непозната или вÑе още не е реализирана" -#: src/xheader.c:173 +#: src/xheader.c:174 #, fuzzy msgid "Time stamp is out of allowed range" msgstr "ЗапиÑано е време извън допуÑÑ‚Ð¸Ð¼Ð¸Ñ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "Образецът %s не може да Ñе използва" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Ключовата дума %s не може да Ñе отмени" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "Лошо формиран разширен заглавен запиÑ: не е поÑочена дължина" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "Дължината %*s на разширен заглавен Ð·Ð°Ð¿Ð¸Ñ Ðµ извън допуÑÑ‚Ð¸Ð¼Ð¸Ñ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "Лошо формиран разширен заглавен запиÑ: липÑва интервал Ñлед дължината" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "Лошо формиран разширен заглавен запиÑ: липÑва знак за равенÑтво" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "Лошо формиран разширен заглавен запиÑ: липÑва знак за нов ред" -#: src/xheader.c:740 +#: src/xheader.c:741 #, fuzzy, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "" "Пренебрегва Ñе непознатата ключова дума „%s“ за разширен заглавен запиÑ" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" @@ -2566,48 +2596,48 @@ msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "РазширениÑÑ‚ заглавен Ð·Ð°Ð¿Ð¸Ñ %s=%s е извън диапазона %s..%s" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Ðеправилно формиран разширен заглавен запиÑ: неправилен %s=%s" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Ðеправилно формиран разширен заглавен запиÑ: прекомерен %s=%s" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" "Лошо формиран разширен заглавен запиÑ: неправилен %s; очаква Ñе разделител %c" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" "Лошо формиран разширен заглавен запиÑ: неправилен %s; нечетен брой ÑтойноÑти" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, fuzzy, c-format msgid "%s: not a valid timeout" msgstr "%s: Ðеправилна група" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "" @@ -2615,7 +2645,7 @@ msgstr "" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "Контролна точка при Ð·Ð°Ð¿Ð¸Ñ %u" @@ -2624,7 +2654,7 @@ msgstr "Контролна точка при Ð·Ð°Ð¿Ð¸Ñ %u" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "Контролна точка при четене %u" @@ -2892,73 +2922,26 @@ msgstr "Командата бе прекратена\n" msgid "--stat requires file names" msgstr "--stat изиÑква файлови имена" -#, fuzzy -#~ msgid "Cannot get working directory" -#~ msgstr "Ðе може да Ñе Ñмени работниÑÑ‚ каталог" - #~ msgid "sort names to extract to match archive" #~ msgstr "файловете за извличане Ñа Ñортирани Ñпоред архива" -#~ msgid "Field too long while reading snapshot file" -#~ msgstr "Твърде дълго поле при четене на snapshot-файл" - -#~ msgid "Read error in snapshot file" -#~ msgstr "Грешка при четене в snapshot-файл" - -#~ msgid "Unexpected field value in snapshot file" -#~ msgstr "Ðеочаквана ÑтойноÑÑ‚ на поле в snapshot-файл" - -#~ msgid "Extended header length is out of allowed range" -#~ msgstr "Дължината на разширен заглавен Ð·Ð°Ð¿Ð¸Ñ Ðµ извън допуÑÑ‚Ð¸Ð¼Ð¸Ñ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½" - #, fuzzy -#~ msgid "Invalid group" -#~ msgstr "%s: Ðеправилна група" +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "не може да Ñе използва --occurrence при Ð¿Ð¾Ð¶ÐµÐ»Ð°Ð½Ð¸Ñ Ð½Ð°Ñ‡Ð¸Ð½ на работа" -#, fuzzy -#~ msgid "%s: Directory removed before we read it" -#~ msgstr "%s: Файлът бе изтрит преди да бъде прочетен" - -#, fuzzy -#~ msgid "Cannot restore working directory" -#~ msgstr "Ðе може да Ñе запази работниÑÑ‚ каталог" - -#, fuzzy -#~ msgid "Cannot resolve hostname %s" -#~ msgstr "Бе невъзможно %s да Ñе преименува на %s" - -#~ msgid "suppress this warning." -#~ msgstr "или --no-wildcards, за да не Ñе извежда това предупреждение." +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "Ðе може да Ñе Ñъчетават --listed-incremental Ñ --newer" #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: неправилна Ð¾Ð¿Ñ†Ð¸Ñ -- %c\n" -#~ msgid "Reading %s\n" -#~ msgstr "Чете Ñе %s\n" - -#~ msgid "" -#~ "\n" -#~ "Report bugs to <%s>.\n" -#~ msgstr "" -#~ "\n" -#~ "Съобщавайте за програмни грешки на <%s>.\n" - -#~ msgid "filter the archive through bzip2" -#~ msgstr "прекарва архива през bzip2" - -#~ msgid "filter the archive through gzip" -#~ msgstr "прекарва архива през gzip" - -#~ msgid "filter the archive through compress" -#~ msgstr "прекарва архива през compress" - -#, fuzzy -#~ msgid "filter the archive through lzma" -#~ msgstr "прекарва архива през gzip" +#~ msgid "block size" +#~ msgstr "блоковиÑÑ‚ размер" -#, fuzzy -#~ msgid "filter the archive through lzop" -#~ msgstr "прекарва архива през gzip" +#~ msgid "%s: Read error at byte %s, reading %lu byte" +#~ msgid_plural "%s: Read error at byte %s, reading %lu bytes" +#~ msgstr[0] "%s: Грешка при четене при байт %s, чете Ñе %lu байт" +#~ msgstr[1] "%s: Грешка при четене при байт %s, четат Ñе %lu байта" #~ msgid "Input string too long" #~ msgstr "ВходниÑÑ‚ низ е твърде дълъг" @@ -2988,22 +2971,33 @@ msgstr "--stat изиÑква файлови имена" #~ " --version Извежда Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° верÑиÑта.\n" #~ " --help Извежда тази Ñправка.\n" +#~ msgid "" +#~ "\n" +#~ "Report bugs to <%s>.\n" +#~ msgstr "" +#~ "\n" +#~ "Съобщавайте за програмни грешки на <%s>.\n" + #~ msgid "Seek offset error" #~ msgstr "Грешка при позициониране" #~ msgid "Premature end of file" #~ msgstr "Преждевременен край на файла" +#~ msgid "Reading %s\n" +#~ msgstr "Чете Ñе %s\n" + #~ msgid "Error is not recoverable: exiting now" #~ msgstr "Грешката е непоправима: край на изпълнението" -#~ msgid "block size" -#~ msgstr "блоковиÑÑ‚ размер" +#~ msgid "Field too long while reading snapshot file" +#~ msgstr "Твърде дълго поле при четене на snapshot-файл" -#~ msgid "%s: Read error at byte %s, reading %lu byte" -#~ msgid_plural "%s: Read error at byte %s, reading %lu bytes" -#~ msgstr[0] "%s: Грешка при четене при байт %s, чете Ñе %lu байт" -#~ msgstr[1] "%s: Грешка при четене при байт %s, четат Ñе %lu байта" +#~ msgid "Read error in snapshot file" +#~ msgstr "Грешка при четене в snapshot-файл" + +#~ msgid "Unexpected field value in snapshot file" +#~ msgstr "Ðеочаквана ÑтойноÑÑ‚ на поле в snapshot-файл" #~ msgid "--Mangled file names--\n" #~ msgstr "--Съкратени имена на файлове--\n" @@ -3023,6 +3017,15 @@ msgstr "--stat изиÑква файлови имена" #~ msgid "Unknown demangling command %s" #~ msgstr "Ðепозната команда за оправÑне на Ñъкратени имена %s" +#~ msgid "suppress this warning." +#~ msgstr "или --no-wildcards, за да не Ñе извежда това предупреждение." + +#~ msgid "filter the archive through bzip2" +#~ msgstr "прекарва архива през bzip2" + +#~ msgid "filter the archive through compress" +#~ msgstr "прекарва архива през compress" + #~ msgid "[.]NUMBER" #~ msgstr "[.]N" @@ -3033,6 +3036,9 @@ msgstr "--stat изиÑква файлови имена" #~ msgid "Error exit delayed from previous errors" #~ msgstr "Изходът Ñ Ð³Ñ€ÐµÑˆÐºÐ° бе забавен поради предхождащи грешки" +#~ msgid "Extended header length is out of allowed range" +#~ msgstr "Дължината на разширен заглавен Ð·Ð°Ð¿Ð¸Ñ Ðµ извън допуÑÑ‚Ð¸Ð¼Ð¸Ñ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½" + #~ msgid "Modification time (seconds) out of range" #~ msgstr "Времето на промÑна (Ñекунди) е извън допуÑÑ‚Ð¸Ð¼Ð¸Ñ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½" diff --git a/po/ca.gmo b/po/ca.gmo index f5b6a7a..aac37d0 100644 Binary files a/po/ca.gmo and b/po/ca.gmo differ diff --git a/po/ca.po b/po/ca.po index 4fd42d7..77bc027 100644 --- a/po/ca.po +++ b/po/ca.po @@ -3,12 +3,12 @@ # This file is distributed under the same license as the tar package. # Àngel Mompó , 2010, 2011. # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" "Project-Id-Version: tar-1.26\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" "PO-Revision-Date: 2011-03-19 11:52+0100\n" "Last-Translator: Àngel Mompó \n" "Language-Team: Catalan \n" @@ -99,7 +99,7 @@ msgstr "dóna aquesta llista d'ajuda" msgid "give a short usage message" msgstr "dóna un missatge curt sobre utilització" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "NOM" @@ -433,7 +433,7 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: No es pot %s" @@ -442,34 +442,34 @@ msgstr "%s: No es pot %s" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: Avís: No es pot %s" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: No es pot canviar el mode a %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: No es pot canviar la titularitat a uid %lu, gid %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: No es pot crear l'enllaç dur amb %s" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Error de lectura al byte %s, quan s'estava llegint %lu byte" msgstr[1] "%s: Error de lectura al byte %s, quan s'estaven llegint %lu bytes" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" @@ -477,22 +477,22 @@ msgstr[0] "" "%s: Avís: Error de lectura al byte %s, quan s'estava llegint %lu byte" msgstr[1] "%s: Error de lectura al byte %s, quan s'estaven llegint %lu bytes" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: No es pot buscar a %s" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: Avís: No es pot buscar a %s" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: No es pot crear l'enllaç simbòlic a %s" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -591,8 +591,8 @@ msgstr "Arguments inesperats" msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "Manipula una unitat de cinta, acceptant comandes d'un procés remot" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "NÚMERO" @@ -600,10 +600,10 @@ msgstr "NÚMERO" msgid "set debug level" msgstr "estableix el nivell de depuració" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "FITXER" @@ -625,104 +625,112 @@ msgstr "massa arguments" msgid "Garbage command" msgstr "Ordre escombraria" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "No sembla un arxiu tar" -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" -msgstr "Bytes totals escrits" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" msgstr "Bytes totals llegits" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "Bytes totals escrits" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Bytes totals esborrats: %s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(conducte)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "El valor de record_size no és vàlid" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "No s'ha donat el nom de l'arxiu" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "No es pot verificar l'arxiu stdin/stdout" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "L'arxiu està comprimit. Feu servir l'opció %s" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "No es poden actualitzar els arxius comprimits" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "Al principi de la cinta, se surt" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "Massa errors, se surt" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Mida del registre = %lu bloc" msgstr[1] "Mida del registre = %lu blocs" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "Bloc desalineat(byte %lu) a l'arxiu" msgstr[1] "Bloc desalineat(bytes %lu) a l'arxiu" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" "No es pot tornar enrere al fitxer d'arxiu; potser no es pot llegir sense -i" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek no s'ha aturat als límits d'un registre " -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: conté un número de volum invàlid" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "Desbordament del número de volum" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Prepareu el volum #%d per %s i premeu retorn: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "Final del fitxer on s'esperava una resposta de l'usuari" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "AVÃS: L'arxiu és incomplet" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -734,66 +742,66 @@ msgstr "" " q Interromp tar\n" " y Continua l'operació\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Engendra un interpret d'ordres\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? Mostra aquesta ajuda\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "No hi ha cap volum nou; se surt.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "No s'ha especificat cap nom de fitxer. Torneu-ho a provar.\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Entrada invàlida. Tecleja ? per mostrar l'ajuda.\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "L'ordre %s ha fallat" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" "%s possiblement continua en aquest volum: la capçalera conté un nom truncat" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s no continua a aquest volum" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s té una mida equivocada (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Aquest volum és fora de la seqüència (%s - %s != %s)" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "L'arxiu no està etiquetat per coincidir amb %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "El Volum %s no coincideix amb %s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -801,7 +809,7 @@ msgstr "" "%s: El nom del fitxer és massa llarg per ser desat en una capçalera " "multivolum GNU. S'ha truncat" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "l'escriptura no ha acabat al límit d'un bloc" @@ -812,16 +820,16 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Només es pot llegir %lu de %lu byte" msgstr[1] "Només es poden llegir %lu de %lu bytes" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "El contingut no coincideix" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "Final de l'arxiu inesperat" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "El tipus de fitxer no coincideix" @@ -841,7 +849,7 @@ msgstr "L'identificador de grup d'usuaris no coincideix" msgid "Mod time differs" msgstr "La data de modificació no coincideix" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "La mida no coincideix" @@ -858,38 +866,38 @@ msgstr "L'enllaç tou no coincideix" msgid "Device number differs" msgstr "El número de dispositiu no coincideix" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Verifiqueu " -#: src/compare.c:471 +#: src/compare.c:473 #, fuzzy, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "" "%s: Tipus de fitxer desconegut `%c', s'usa diff com si es tractés d'un " "fitxer normal" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "L'arxiu conté noms de fitxers amb els prefixes inicials esborrats." -#: src/compare.c:533 +#: src/compare.c:535 msgid "Archive contains transformed file names." msgstr "L'arxiu conté noms de fitxers transformats." -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "Pot ser que la verificació no pugui trobar els fitxers originals." -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "HA FALLAT LA VERIFICACIÓ: %d s'ha detectat una capçalera invàlida" msgstr[1] "HA FALLAT LA VERIFICACIÓ: %d s'han detectat capçaleres invàlides" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "Un sol bloc zero a %s" @@ -935,55 +943,55 @@ msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "%s: El fitxer s'encongeix %s byte; s'omple amb zero" msgstr[1] "%s: El fitxer s'encongeix %s bytes; s'omple amb zeros" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: el fitxer es troba a un sistema de fitxers diferent; no s'aboca" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "els continguts no s'aboquen" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Tipus de fitxer desconegut; el fitxer s'ignora" -#: src/create.c:1549 +#: src/create.c:1551 #, c-format msgid "Missing links to %s." msgstr "Falten els enllaços a %s." -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: el fitxer no ha canviat; no s'aboca" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: el fitxer és l'arxiu; no s'aboca" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "el directori no s'aboca" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: el fitxer ha canviat mentre es llegia" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: sòcol ignorat" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: porta ignorada" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Es salta fins a la propera capçalera" @@ -1030,7 +1038,7 @@ msgstr "Es prova d'extreure els enllaços simbòlics com enllaços durs" msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: No espot extreure -- el fitxer continua des d'un altre volum" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" msgstr "Nom de la capçalera inesperadament llarg" @@ -1074,157 +1082,157 @@ msgstr "%s: el fitxer es troba a un sistema de fitxers diferent; no s'aboca" msgid "%s: Directory has been renamed" msgstr "%s: El directori ha canviat de nom" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "Marca horària invàlida" -#: src/incremen.c:1045 +#: src/incremen.c:1047 #, fuzzy msgid "Invalid modification time" msgstr "Modificació invalida del temps (segons)" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "Modificació invàlida del temps (nanosegons)" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "Número de dispositiu invàlid" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Número de node d'identificació invàlid" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" msgstr "" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" msgstr "Final de l'arxiu d'instantània inesperat" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" msgstr "" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" msgstr "" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "Falta el terminador del registre" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "Format del fitxer incremental erroni" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "No se suporta la versió del format incremental: %" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Directori d'abocament mal format: s'esperava «%c» i s'ha trobat %#3o" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Directori d'abocament mal format: «X» duplicada" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Directori d'abocament mal format: nom buit a «R»" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Directori d'abocament mal format: «T» no està  precedit de «R»" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Directori d'abocament mal format: nom buit a «T»" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" "Directori d'abocament mal format: s'esperava «%c» però s'ha trobat el final " "de les dades" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "Directori d'abocament mal format: no s'ha fet servir «X»" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "No es pot crear el directori temporal fent servir la plantilla %s" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: No es purga el directori: no se'n pot saber l'estat" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: el directori és en un dispositiu diferent: no es purga" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: S'elimina %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: No es pot esborrar" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: S'ometen" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "bloc %s: ** Bloc de NULs **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "bloc %s: ** Final del Fitxer **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "bloc %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Capçalera amb blancs on hi hauria d'haver un valor numèric %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1232,96 +1240,96 @@ msgstr "" "complement a dos" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "El valor octal de l'arxiu %.*s està fora del rang %s" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "L'arxiu conté capçaleres amb base 64 que estan esdevenint obsoletes" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "La cadena de signatura %s amb base 64 de l'arxiu està fora del rang %s" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "El valor amb base 256 de l'arxiu està fora del rang %s " #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "L'arxiu conté %.*s on hi hauria d'haver un valor numèric de tipus %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "El valor %s de l'arxiu està fora del rang %s %s..%s" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " enllaç cap a %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " tipus de fitxer desconegut %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--Enllaç llarg--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--Nom Llarg--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Capçalera del volum--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Continua al byte %s--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Es crea el directori:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "Es canvia el nom %s per %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: No es pot canviar el nom a %s" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "Es torna a canviar el nom %s a %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: El fitxer s'ha esborrat abans de poder-lo llegir" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "procés descendent" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "canal d'intercomunicació" @@ -1335,7 +1343,7 @@ msgstr "L'ordre %s ha fallat" msgid "%s: file list requested from %s already read from %s" msgstr "%s: la llista de fitxers ja s'ha llegit" -#: src/names.c:448 +#: src/names.c:448 src/checkpoint.c:274 #, fuzzy, c-format msgid "cannot split string '%s': %s" msgstr "no es pot definir el temps de «%s»" @@ -1345,12 +1353,12 @@ msgstr "no es pot definir el temps de «%s»" msgid "%s: file name read contains nul character" msgstr "%s: la lectura del nom del fixter conté un caràcter nul" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "" "Caràcters de patró de coincidència que es fan servir en noms de fitxers" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1358,48 +1366,48 @@ msgstr "" "Feu servir --wildcards per habilitar els patrons de coincidència, o --no-" "wildcars per eliminar aquest avís." -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: No s'ha trobat a l'arxiu" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: No s'ha trobat cap coincidència a l'arxiu" -#: src/names.c:876 +#: src/names.c:879 #, c-format msgid "Archive label mismatch" msgstr "L'etiqueta de l'arxiu no coincideix" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "No podeu fer servir la opció -C als llistats de fitxer amb --listed-" "incremental" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Només podeu fer servit una opció -C amb --listed-incemental" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "Ambdues opcions «-%s» i «-%s» necessiten la sortida estàndard" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s: Format de fitxer invàlid" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "" "El format de l'arxiu és incompatible perquè requereix característiques de GNU" -#: src/tar.c:255 +#: src/tar.c:264 #, fuzzy, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." @@ -1407,7 +1415,7 @@ msgstr "" "Estil de citació desconegut «%s». Feu servir «%s --quoting-style=help» per " "obtenir-ne una llista." -#: src/tar.c:364 +#: src/tar.c:378 #, fuzzy msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " @@ -1427,7 +1435,7 @@ msgstr "" "ha a l'arxiu.tar.\n" " tar -xf arxiu.tar # Extreu tots els fitxers de l'arxiu.tar.\n" -#: src/tar.c:373 +#: src/tar.c:387 #, fuzzy msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1450,82 +1458,82 @@ msgstr "" "no simples\n" " never, simple fes sempre còpies de seguretat simples\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "Mode d'operació principal:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "Llista els continguts d'un arxiu" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "extreu fitxers d'un arxiu" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "crea un arxiu nou" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "cerca diferències entre un arxiu i el sistema de fitxers" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "afegeix fitxers al final d'un arxiu" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "només afegeix els fitxers més nous que les còpies dins l'arxiu" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "afegeix fitxers tar a un arxiu" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "esborra de l'arxiu (excepte en cintes magnètiques!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "prova l'etiqueta de volum de l'arxiu i surt" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "Modificadors d'operació:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "tracta fitxers dispersos de manera eficient" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "MAJOR[.MENOR]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" "estableix la versió del format de dispersió que cal fer servir (implica --" "sparse)" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "tracta l'antic format incremental GNU de còpies de seguretat" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "tracta el nou format de còpies de seguretat incrementals de GNU" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "nivell de bolcat per l'arxiu llistat-incremental creat" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "" "no surtis si l'estat és diferent de zero quan trobis fitxers il·legibles " -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1537,137 +1545,145 @@ msgstr "" "extract o --list i quan es dona una llista de fitxers ja sigui a la línia de " "comandes com amb l'opció -T; ENA val 1 per defecte" -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "l'arxiu pot buscar-se" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "L'arxiu no pot buscar-se" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "no comprovis el número de dispositiu quan creis arxius incrementals" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" "comprova el número de dispositiu quan creis arxius incrementals (per defecte)" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "Control de sobreescriptura:" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "intenta verificar l'arxiu després d'escriure'l" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "eliminar els fitxers després d'afegir-los a l'arxiu" -#: src/tar.c:471 +#: src/tar.c:485 #, fuzzy msgid "don't replace existing files when extracting, treat them as errors" msgstr "no reemplacis els fitxers existents quan els extreguis" -#: src/tar.c:474 +#: src/tar.c:488 #, fuzzy msgid "don't replace existing files when extracting, silently skip over them" msgstr "no reemplacis els fitxers existents quan els extreguis" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "" "no reemplacis els fitxers existents que siguin més nous que les còpies de " "l'arxiu" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "sobreescriu els fitxers existents quan els extreguis" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "elimina cada fitxer abans d'extreure-hi a sobre" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "buida les jerarquies abans d'extreure el directori" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "conserva les metadades dels directoris existents" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "sobreescriu les metadades dels directoris existents quan s'extreguin (per " "defecte)" -#: src/tar.c:490 +#: src/tar.c:504 #, fuzzy msgid "preserve existing symlinks to directories when extracting" msgstr "sobreescriu els fitxers existents quan els extreguis" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "DIRECTORI" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "Selecciona la sortida del flux de dades:" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "extreu els fitxers a la sortida estàndard" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "COMANDA" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "condueix els fitxers extrets a un altre programa" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "ignora els codis de sortida dels processos fill" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "" "tracta els codis de sortida dels processos fills diferents de zero com a " "error" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Gestió dels atributs del fitxer:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "força NOM coma propietari dels fitxers afegits" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "força NOM com a grup pels fitxers afegits" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "DATA-O-FITXER" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "estableix mtime pels fitxers afegits des de DATA-O-FITXER" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "CANVIS" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "força CANVIS de mode (simbòlic) als fitxers que s'afegeixin" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "MÈTODE" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " @@ -1677,11 +1693,11 @@ msgstr "" "hores després de llegir-los (MÈTODE='replace'; per defecte) o no posant " "primer les hores(MÈTODE='system')" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "no extreguis la data de modificació dels fitxers" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" @@ -1689,23 +1705,23 @@ msgstr "" "intenta extreure els fitxers amb el mateix propietari que existeix a l'arxiu " "(per defecte pel superusuari)" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "" "extreu el fitxer com a tu mateix com a propietari (per defecte pels usuaris " "ordinaris" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "fes servir sempre números pels noms de usuari/grup" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" "extreu la informació dels permisos del fitxer (per defecte per al " "superusuari)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1713,16 +1729,16 @@ msgstr "" "fes servir els permisos especificats per l'usuari qua s'extreguin permisos " "de l'arxiu (per defecte per usuaris normals)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "el mateix que per -p i -s" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1730,180 +1746,188 @@ msgstr "" "no modifiquis els temps i els permisos dels directoris extrets fins que " "s'acabi l'extracció" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "cancel·la l'efecte de l'opció --delay-directory-restore" -#: src/tar.c:554 +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 #, fuzzy msgid "Handling of extended file attributes:" msgstr "Gestió dels atributs del fitxer:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" msgstr "" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" msgstr "" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" msgstr "" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" msgstr "" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" msgstr "" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" msgstr "" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" msgstr "" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" msgstr "" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "Selecció i canvi de dispositiu:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ARXIU" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "fes servir el fitxer o dispositiu ARXIU" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "l'arxiu és local encara que tingui dos punts" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "fes servir la COMANDA rmt en comtes de rmt" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "fes servir la COMANDA remota en comptes de rsh" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "especifica la unitat i la densitat" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "crea/llista/extreu arxius de múltiples volums" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "canvia la cinta després d'escriure NÚMERO x 1024 bytes" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "executa seqüència al final de cada cinta (implica -M)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "fes servir/actualitza el número de volum del FITXER" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "Blocs als dispositius:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "BLOCS" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "BLOCS x 512 bytes per registre" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "NÚMERO de bytes per registre, múltiple de 512" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "ignora els blocs posats a zero de l'arxiu (volen dir fi del fitxer)" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "refés els blocs mentre els llegeixes (per conductes de 4.2BSD)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "Selecció del format de l'arxiu: " -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "FORMAT" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "crea un arxiu del format especificat" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "El FORMAT és un dels següents" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "format tar de l'antiga versió 7" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "format GNU tar <= 1.12" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "format GNU tar 1.13.x" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "format POSIX 1003.1-1988 (ustar)" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "format POSIX 1003.1-2001 (pax)" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "el mateix que pax" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "el mateix que --format=v7" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "el mateix que --format=posix" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "paraula clau[[:]=valor][,paraula clau[[:]=valor]]..." -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "controla les paraules clau de pax" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "TEXT" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1911,76 +1935,74 @@ msgstr "" "crea l'arxiu amb el nom de volum TEXT. Quan es llista/s'extreu, utilitza " "TEXT com a patró global de noms de volum" -#: src/tar.c:660 +#: src/tar.c:684 msgid "Compression options:" msgstr "Opcions de compressió:" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "utilitza el sufix de l'arxiu per determinar el programa de compressió" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "" "no fa servir el sufix de l'arxiu per determinar el programa de compressió" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "PROGRAMA" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "filtra mitjançant PROGRAMA (ha d'acceptar -d)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "Selecció de fixter local:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "afegeix el FITXER a l'arxiu (útil si el nom comença per un guió)" -#: src/tar.c:687 -msgid "DIR" -msgstr "DIRECTORI" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "Canvia al directori DIRECTORI" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "obté els noms que cal extreure u crear del FITXER" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "-T llegeix els noms acabats en nul, desactivar-ho amb -C" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "deshabilita l'efecte del la opció --null prèvia" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" msgstr "treu les cometes dels noms dels fitxers llegits amb -T (per defecte)" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" msgstr "no treguis les cometes dels noms dels fitxers llegits amb -T" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "PATRÓ" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "exclou els fitxers que es donen com un PATRÓ" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "exclou els patrons que es llisten al FITXER" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1988,98 +2010,112 @@ msgstr "" "exclou el contingut dels directoris que continguin CACHEDIR.TAG, excepte el " "propi fitxer d'etiquetes" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "exclou tot el que estigui als directoris que continguin CACHEDIR.TAG" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "exclou els directoris que continguin CACHEDIR.TAG " -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" "exclou el contingut dels directoris que contenen el FITXER, excepte el " "FITXER mateix" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "exclou tot el que hi hagi al directori que contingui el FITXER" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "exclou els directoris que continguin el FITXER" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "exclou els directoris del sistema de control de versions" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "exclou els fitxers de còpia de seguretat i de blocat" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "no baixa automàticament als directoris" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "queda't al sistema de fitxers local quan creïs l'arxiu" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "incloure els subdirectoris (per defecte)" -#: src/tar.c:729 +#: src/tar.c:761 #, fuzzy msgid "don't strip leading '/'s from file names" msgstr "no treguis les primeres «/» dels noms dels fitxers" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "" "segueix els enllaços simbòlics; arxiva i aboca els fitxers als quals apunten" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "" "segueix els enllaços durs; arxiva i aboca els fitxers als quals es refereix" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "NOM-DEL-MEMBRE" -#: src/tar.c:735 +#: src/tar.c:767 #, fuzzy msgid "begin at member MEMBER-NAME when reading the archive" msgstr "comença al membre NOM-DEL MEMBRE de l'arxiu" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "desa només els fitxers més nous que DATA-O-FITXER" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "DATA" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "compara la data i l'hora només quan les dades hagin canviat" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "CONTROL" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "" "fes una còpia de seguretat abans d'esborrar, tria el CONTROL de versions" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "CADENA" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -2087,104 +2123,104 @@ msgstr "" "fa una còpia de seguretat abans d'esborrar, substitueix el sufix usual («~» " "si no s'ha definit la variable d'entorn SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "Transformacions del nom del fitxer:" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "" "treu NÚMERO components de la capçalera dels noms dels fitxers quan extreu" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "EXPRESSIÓ" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "" "fes servir l'EXPRESSIÓ de substitució sed per transformar els noms dels " "fitxers" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "opcions de concordança de nom de fitxer (afecta tant als patrons de inclusió " "com als d'exclusió):" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "ignora diferències majúscules/minúscules" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "comprova els patrons del començament del nom del fitxer" -#: src/tar.c:767 +#: src/tar.c:799 #, fuzzy msgid "patterns match after any '/' (default for exclusion)" msgstr "" "comprova els patrons després de qualsevol «/» (per defecte a les exclusions) " -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "comprova diferències majúscules/minúscules (per defecte)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "fa servir comodins (per defecte a les exclusions)" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "concordància exacte a les cadenes" -#: src/tar.c:775 +#: src/tar.c:807 #, fuzzy msgid "wildcards do not match '/'" msgstr "els comodins no han de concordar amb «/»" -#: src/tar.c:777 +#: src/tar.c:809 #, fuzzy msgid "wildcards match '/' (default for exclusion)" msgstr "els comodins han de concordar amb «/» (per defecte a les exclusions)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Sortida informativa:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "llista els fitxers processats detalladament" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "PARAULA CLAU" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "control d'avisos" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "mostra els missatges de progres cada NÚMERO registres (per defecte 10)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "ACCIÓ" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "executa ACCIÓ a cada punt de comprovació" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "mostra un missatge si no s'aboquen tots els enllaços" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "SENYAL" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2196,35 +2232,35 @@ msgstr "" "SIGHUP, SIGQUIT, SIGINT, SIGUSR1 i SIGUSR2. També s'accepta els noms sense " "el prefix SIG" -#: src/tar.c:802 +#: src/tar.c:834 msgid "print file modification times in UTC" msgstr "mostra l'hora de modificació del fitxer en UTC" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "Mostra l'hora del fitxer amb alta precisió" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "envia la sortida detallada al FITXER" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "mostra el número de bloc de dins l'arxiu a cada missatge" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "demana la confirmació per cada acció" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "mostra els valors per defecte de tar" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2232,33 +2268,33 @@ msgstr "" "quan es llisti o s'extregui, llista tots els directoris que no es " "corresponguin amb el criteri de cerca" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "mostra el nom del fitxer o de l'arxiu després de la transformació" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "ESTIL" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "" "estableix el nom de l'estil de citació; vegeu més avall una llista de valors " "vàlids per ESTIL" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "més caràcters de cometes des de CADENA" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "deshabilita els caràcters de cometa de la CADENA" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "Opcions de compatibilitat:" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2266,55 +2302,55 @@ msgstr "" "quan es crea, el mateix que --old-archive; quan s'extreu, el mateix que --no-" "same-owner" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "Altres opcions:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "desactiva l'ús de certes opcions potencialment perjudicials" -#: src/tar.c:978 +#: src/tar.c:1010 #, fuzzy msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" msgstr "No podeu especificar més d'un «-Acdtrux» o d'opció «--test-label»" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Opcions de compressió conflictives" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "Nom del senyal desconegut: %s" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "No s'ha trobat el fitxer de mostra de la data" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "S'està substituint %s pel format de data desconegut %s" -#: src/tar.c:1108 +#: src/tar.c:1140 #, fuzzy, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "Opció %s: S'està tractant la data «%s» com a %s" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "filtra l'arxiu a mitjançant %s" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "Les opcions vàlides per la opció --quoting-style són:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2322,48 +2358,48 @@ msgstr "" "\n" "*Aquest* tar va per defecte en:\n" -#: src/tar.c:1295 +#: src/tar.c:1330 #, fuzzy msgid "Invalid owner or group ID" msgstr "Propietari invàlid" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Factor de blocs invàlid" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "Longitud de la cinta invàlida" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "valor invàlid del nivell d'increment" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "Més d'una data del llindar" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "valor de la versió de la opció de dispersió invalid" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "No es permet l'ús de --atime-preserve=«system» en aquesta plataforma" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "El valor --checkpoint no és un enter" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Mode invàlid donat a les opcions" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "Número invàlid" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" @@ -2371,149 +2407,143 @@ msgstr "" "La opció --preserve es obsoleta, en comptes d'això feu servir --preserve-" "permissions --preserve-order" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Mida del registre invàlida" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "La mida del registre ha de ser múltiple de %d." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "Nombre d'elements invàlid" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "Només es permet una opció --to-command" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "Argument de densitat mal format: %s" -#: src/tar.c:2133 +#: src/tar.c:2205 #, fuzzy, c-format msgid "Unknown density: '%c'" msgstr "Densitat desconeguda: «%c»" -#: src/tar.c:2150 +#: src/tar.c:2222 #, fuzzy, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "Opcions «-[0-7][lmh]» no suportades per *aquest* tar" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[FITXER]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 +#, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "No s'ha pogut utilitzar el patró %s " + +#: src/tar.c:2389 #, fuzzy, c-format msgid "Old option '%c' requires an argument." msgstr "L'opció antiga «%c» requereix un argument." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence no te sentit sense una llista de fitxers" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "--occurrence no es pot utilitzar en el mode d'operació que ha requerit" - -#: src/tar.c:2408 +#: src/tar.c:2490 #, fuzzy msgid "Multiple archive files require '-M' option" msgstr "Per a múltiples arxius de fitxers es requereix l'opció «-M»" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "No es pot combinar --listed-incremental amb --newer" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "--level no té sentit sense --listed-incremental" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "%s: l'etiqueta del volum és massa llarga (el limit és %lu byte)" msgstr[1] "%s: l'etiqueta del volum és massa llarga (el limit és %lu bytes)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "No es poden verificar els arxius multi-volum" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "No es poden verificar els arxius comprimits" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "No s'ha pogut utilitzar el patró %s " - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "No es poden utilitzar arxius comprimits multi-volum" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "No es poden concatenar arxius comprimits" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option només es pot utilitzar en arxius POSIX" -#: src/tar.c:2478 +#: src/tar.c:2560 #, fuzzy msgid "--acls can be used only on POSIX archives" msgstr "--pax-option només es pot utilitzar en arxius POSIX" -#: src/tar.c:2483 +#: src/tar.c:2565 #, fuzzy msgid "--selinux can be used only on POSIX archives" msgstr "--pax-option només es pot utilitzar en arxius POSIX" -#: src/tar.c:2488 +#: src/tar.c:2570 #, fuzzy msgid "--xattrs can be used only on POSIX archives" msgstr "--pax-option només es pot utilitzar en arxius POSIX" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "No s'ha pogut utilitzar el patró %s " +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" +msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "La llargada del volum no pot ser inferior que la mida del registre" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "--preserve-order no és compatible amb --listed-incremental" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "S'està refusant covardament crear un arxiu buit" -#: src/tar.c:2565 +#: src/tar.c:2669 #, fuzzy msgid "Options '-Aru' are incompatible with '-f -'" msgstr "Les opcions «-Aru» son incompatibles amb «-f -»" -#: src/tar.c:2660 +#: src/tar.c:2766 #, fuzzy msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" msgstr "Heu d'especificar una opció «-Acdtrux» o «--test-label»" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "Se surt amb estat de fallida degut a errors prèvis" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" @@ -2521,52 +2551,52 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: El fitxer s'encongeix %s byte" msgstr[1] "%s: El fitxer s'encongeix %s bytes" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "La paraula clau %s és desconeguda o encara no s'ha implementat" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" msgstr "La marca horària està fora del rang permés" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "No s'ha pogut utilitzar el patró %s " -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "No s'ha pogut sobreescriure la paraula clau %s" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "Capçalera estesa mal formada: falta la longitud" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "La longitud de la capçalera estesa %*s està fora de rang" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "Capçalera estesa mal formada: falta l'espai després de la longitud" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "Capçalera estesa mal formada: falta el signe igual" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "Capçalera estesa mal formada: falta el salt de línia" -#: src/xheader.c:740 +#: src/xheader.c:741 #, fuzzy, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "S'ignora la paraula clau desconeguda de la capçalera estesa «%s»" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" @@ -2575,46 +2605,46 @@ msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "La capçalera estesa %s=%s està fora del rang %s..%s" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Capçalera estesa mal formada: %s=%s invàlid" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Capçalera estesa mal formada: excedeix %s=%s" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "Capçalera estesa mal formada: %s invàlid, delimitador %c inesperat" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "Capçalera estesa mal formada: %s invàlid: nombre de valors incorrecte" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "%s: no és un temps d'espera vàlid" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "%s: acció del punt de comprovació desconegut" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "escriu" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "llegeix" @@ -2622,7 +2652,7 @@ msgstr "llegeix" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "Punt de comprovació d'escriptura %u" @@ -2631,7 +2661,7 @@ msgstr "Punt de comprovació d'escriptura %u" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "Punt de comprovació de lectura %u" @@ -2898,12 +2928,20 @@ msgstr "Comanda finalitzada\n" msgid "--stat requires file names" msgstr "--stat requereix noms de fitxers" -#~ msgid "Cannot get working directory" -#~ msgstr "No es pot trobar el directori de treball" - #~ msgid "sort names to extract to match archive" #~ msgstr "ordena els noms a extreure per que coincideixin amb els de l'arxiu" +#, fuzzy +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "" +#~ "--occurrence no es pot utilitzar en el mode d'operació que ha requerit" + +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "No es pot combinar --listed-incremental amb --newer" + +#~ msgid "--preserve-order is not compatible with --listed-incremental" +#~ msgstr "--preserve-order no és compatible amb --listed-incremental" + #~ msgid "Field too long while reading snapshot file" #~ msgstr "Camp massa llarg en llegir el fitxer d'instantània" @@ -2913,12 +2951,15 @@ msgstr "--stat requereix noms de fitxers" #~ msgid "Unexpected field value in snapshot file" #~ msgstr "Valor de camp inesperat del fitxer d'instantània" -#~ msgid "Extended header length is out of allowed range" -#~ msgstr "Longitud de la capçalera estesa està fora del rang permès" +#~ msgid "Cannot get working directory" +#~ msgstr "No es pot trobar el directori de treball" #~ msgid "Invalid group" #~ msgstr "Grup invàlid" +#~ msgid "Extended header length is out of allowed range" +#~ msgstr "Longitud de la capçalera estesa està fora del rang permès" + #~ msgid "%s: Directory removed before we read it" #~ msgstr "%s: El directori s'ha esborrat abans de poder-lo llegir" diff --git a/po/cs.gmo b/po/cs.gmo index 2a12a54..26eba01 100644 Binary files a/po/cs.gmo and b/po/cs.gmo differ diff --git a/po/cs.po b/po/cs.po index 69571a7..5ba69e4 100644 --- a/po/cs.po +++ b/po/cs.po @@ -2,7 +2,7 @@ # Copyright (C) 1997 Free Software Foundation, Inc. # This file is distributed under the same license as the tar package. # Vladimir Michl , 1997. -# Petr Pisar , 2009, 2010, 2011. +# Petr Pisar , 2009, 2010, 2011, 2013. # # Pozor: program sám zalamuje dlouhé řádky, ale místo (Å¡irokých) znaků poÄítá # bajty. Proto je nutné dodržovat nezlomitelné mezery, které program rovněž @@ -12,13 +12,13 @@ # tape → páska (rod ženský, vzor žena; ne pásek) # seek offset → pozice posunu (pásky) # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" -"Project-Id-Version: tar 1.26\n" +"Project-Id-Version: tar 1.27\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" -"PO-Revision-Date: 2011-03-13 19:24+0100\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" +"PO-Revision-Date: 2013-10-07 19:06+0200\n" "Last-Translator: Petr Pisar \n" "Language-Team: Czech \n" "Language: cs\n" @@ -87,7 +87,7 @@ msgid " [OPTION...]" msgstr " [PŘEPÃNAČ…]" #: gnu/argp-help.c:1686 -#, fuzzy, c-format +#, c-format msgid "Try '%s --help' or '%s --usage' for more information.\n" msgstr "Více informací získáte pomocí „%s --help“ nebo „%s --usage“.\n" @@ -111,7 +111,7 @@ msgid "give a short usage message" msgstr "vypíše struÄný návod na použití" # JMÉNO jako v přísluÅ¡né položce nápovÄ›dy -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "JMÉNO" @@ -150,9 +150,9 @@ msgid "write error" msgstr "chyba zápisu" #: gnu/getopt.c:549 gnu/getopt.c:578 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: pÅ™epínaÄ â€ž%s“ není jednoznaÄný\n" +msgstr "%s: pÅ™epínaÄ â€ž%s“ není jednoznaÄný; možnosti:" #: gnu/getopt.c:626 gnu/getopt.c:630 #, c-format @@ -451,7 +451,7 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: Funkce %s selhala" @@ -460,27 +460,27 @@ msgstr "%s: Funkce %s selhala" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: Varování: Funkce %s selhala" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: Práva nelze zmÄ›nit na %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: Vlastnictví nelze zmÄ›nit na UID %lu, GID %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: Pevný odkaz na %s nelze vytvoÅ™it" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" @@ -488,7 +488,7 @@ msgstr[0] "%s: Chyba pÅ™i Ätení na bajtu %s bÄ›hem Ätení %lu bajtu" msgstr[1] "%s: Chyba pÅ™i Ätení na bajtu %s bÄ›hem Ätení %lu bajtů" msgstr[2] "%s: Chyba pÅ™i Ätení na bajtu %s bÄ›hem Ätení %lu bajtů" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" @@ -496,22 +496,22 @@ msgstr[0] "%s: Varování: Chyba pÅ™i Ätení na bajtu %s bÄ›hem Ätení %lu baj msgstr[1] "%s: Varování: Chyba pÅ™i Ätení na bajtu %s bÄ›hem Ätení %lu bajtů" msgstr[2] "%s: Varování: Chyba pÅ™i Ätení na bajtu %s bÄ›hem Ätení %lu bajtů" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: Nelze zmÄ›nit pozici v souboru na %s" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: Varování: Ukazatel v souboru nelze pÅ™emístit na %s" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: Symbolický odkaz na „%s“ nelze vytvoÅ™it" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -560,9 +560,9 @@ msgid "Cannot connect to %s: resolve failed" msgstr "K %s se nelze pÅ™ipojit: selhal pÅ™eklad" #: lib/rtapelib.c:502 -#, fuzzy, c-format +#, c-format msgid "Cannot redirect files for remote shell" -msgstr "Vzdálený shell není možné spustit" +msgstr "Soubory nelze pÅ™esmÄ›rovat ke vzdálenému shellu" #: lib/rtapelib.c:516 #, c-format @@ -613,8 +613,8 @@ msgstr "NeoÄekávané argumenty" msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "Ovládá páskovou jednotku pÅ™ijímaje příkazy ze vzdáleného procesu" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "ÄŒÃSLO" @@ -622,10 +622,10 @@ msgstr "ÄŒÃSLO" msgid "set debug level" msgstr "nastaví úroveň ladÄ›ní" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "SOUBOR" @@ -647,59 +647,67 @@ msgstr "příliÅ¡ mnoho argumentů" msgid "Garbage command" msgstr "Neznámý příkaz" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Toto pravdÄ›podobnÄ› není tar archiv" -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" -msgstr "Celkem zapsáno bajtů" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" msgstr "Celkem pÅ™eÄteno bajtů" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "Celkem zapsáno bajtů" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Celkem smazáno bajtů: %s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(roura)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "Chybná hodnota pro velikost záznamu" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Název archivu nebyl zadán" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Stdin/Stdout archiv nelze ověřit" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Archiv je komprimován. Použijte pÅ™epínaÄ %s" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Komprimovaný archiv nelze aktualizovat" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "Páska na zaÄátku, konÄím" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "PříliÅ¡ mnoho chyb, konÄím" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" @@ -707,7 +715,7 @@ msgstr[0] "Velikost záznamu = %'lu blok" msgstr[1] "Velikost záznamu = %'lu bloky" msgstr[2] "Velikost záznamu = %'lu bloků" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" @@ -715,37 +723,37 @@ msgstr[0] "Nezarovnaný blok (%'lu bajt) v archivu" msgstr[1] "Nezarovnaný blok (%'lu bajty) v archivu" msgstr[2] "Nezarovnaný blok (%'lu bajtů) v archivu" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "V archivu se nelze vrátit, bez -i může být neÄitelný" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek se nezastavil na hranici záznamu" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: obsahuje neplatné Äíslo svazku" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "U Äísla svazku nastalo pÅ™eteÄení" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "PÅ™ipravte svazek #%d pro archiv %s a stisknÄ›te return:" -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "Místo uživatelské odpovÄ›di byl zadán konec souboru" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "VAROVÃNÃ: Archiv je nekompletní" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -756,65 +764,65 @@ msgstr "" " q UkonÄit program tar\n" " y nebo odřádkování PokraÄovat v operaci\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! VytvoÅ™it podshell\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? Vypsat tuto nápovÄ›du\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Není nový svazek; konÄím.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "Název souboru nebyl zadán. Zkuste to znovu.\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Neplatný vstup. NápovÄ›du obdržíte napsáním „?“ (otazníku).\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "příkaz %s selhal" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s možná pokraÄuje na tomto svazku: hlaviÄka obsahuje zkrácený název" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s nepokraÄuje na tomto svazku" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s je Å¡patné délky (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Tento svazek není je mimo poÅ™adí (%s − %s != %s)" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "Pro vyhodnocení vzorku %s musí být archiv pojmenován" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "Svazek %s neodpovídá vzorku %s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -822,7 +830,7 @@ msgstr "" "%s: název souboru je příliÅ¡ dlouhý, aby byl uložen do vícesvazkové hlaviÄky " "GNU, bude zkrácen" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "zápis neskonÄil na konci hranice bloku" @@ -834,16 +842,16 @@ msgstr[0] "Bylo možné naÄíst pouze %'lu z %'lu bajtu" msgstr[1] "Bylo možné naÄíst pouze %'lu z %'lu bajtů" msgstr[2] "Bylo možné naÄíst pouze %'lu z %'lu bajtů" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "Obsahy se liší" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "NeoÄekávaný konec archivu" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "Typ souboru se liší" @@ -863,7 +871,7 @@ msgstr "GID se liší" msgid "Mod time differs" msgstr "ÄŒas poslední modifikace se liší" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Velikost se liší" @@ -880,29 +888,29 @@ msgstr "Symbolický odkaz se liší" msgid "Device number differs" msgstr "Číslo zařízení se liší" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Ověřuji " -#: src/compare.c:471 -#, fuzzy, c-format +#: src/compare.c:473 +#, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "%s: Neznámý typ souboru „%c“, porovnáván jako normální soubor" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "Archiv obsahuje názvy souborů, kterým byly odstranÄ›ny pÅ™edpony." -#: src/compare.c:533 +#: src/compare.c:535 msgid "Archive contains transformed file names." msgstr "Archiv obsahuje transformované názvy souborů." -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "PÅ™i kontrole může selhat nalezení původních souborů." -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" @@ -910,7 +918,7 @@ msgstr[0] "SELHÃNà KONTROLY: zjiÅ¡tÄ›na %d chybná hlaviÄka" msgstr[1] "SELHÃNà KONTROLY: zjiÅ¡tÄ›ny %d chybné hlaviÄky" msgstr[2] "SELHÃNà KONTROLY: zjiÅ¡tÄ›no %d chybných hlaviÄek" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "OsiÅ™elý nulový blok na pozici %s" @@ -957,55 +965,55 @@ msgstr[0] "%s: Soubor je kratší o %s bajt; Doplňuji nulami." msgstr[1] "%s: Soubor je kratší o %s bajty; Doplňuji nulami." msgstr[2] "%s: Soubor je kratší o %s bajtů; Doplňuji nulami." -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: soubor je na jiném souborovém systému; nearchivován" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "obsah nezpracován" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Neznámý typ souboru; soubor ignorován" -#: src/create.c:1549 +#: src/create.c:1551 #, c-format msgid "Missing links to %s." msgstr "Chybí odkazy na %s." -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: soubor není zmÄ›nÄ›n; neaktualizován" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: soubor je archiv; nearchivován" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "adresář nezpracován" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: soubor byl bÄ›hem Ätení zmÄ›nÄ›n" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: soket ignorován" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: dveÅ™e ignorovány" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "PÅ™eskakuji na další hlaviÄku" @@ -1031,7 +1039,7 @@ msgstr "%s: NeoÄekávaná inkonzistence, pÅ™i vytváření adresáře" #: src/extract.c:705 #, c-format msgid "%s: skipping existing file" -msgstr "" +msgstr "%s: existující soubor se pÅ™eskakuje" #: src/extract.c:821 #, c-format @@ -1051,12 +1059,12 @@ msgstr "Zkouším rozbalit symbolické odkazy jako pevné odkazy" msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Nelze rozbalit – soubor je pokraÄováním jiného svazku" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" msgstr "NeoÄekávaná hlaviÄka dlouhého názvu" #: src/extract.c:1542 -#, fuzzy, c-format +#, c-format msgid "%s: Unknown file type '%c', extracted as normal file" msgstr "%s: Neznámý typ souboru „%c“, rozbalen jako normální soubor" @@ -1086,288 +1094,288 @@ msgid "%s: Directory is new" msgstr "%s: Adresář je nový" #: src/incremen.c:566 -#, fuzzy, c-format +#, c-format msgid "%s: directory is on a different filesystem; not dumped" -msgstr "%s: soubor je na jiném souborovém systému; nearchivován" +msgstr "%s: adresář je na jiném souborovém systému; nearchivován" #: src/incremen.c:587 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Adresář byl pÅ™ejmenován" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "Neplatný Äas souboru" -#: src/incremen.c:1045 -#, fuzzy +#: src/incremen.c:1047 msgid "Invalid modification time" -msgstr "Neplatný Äas zmÄ›ny obsahu souboru (sekundy)" +msgstr "Neplatný Äas zmÄ›ny obsahu souboru" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "Neplatný Äas zmÄ›ny obsahu souboru (nanosekundy)" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "Neplatné Äíslo zařízení" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Neplatné Äíslo i-uzlu" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" -msgstr "" +msgstr "%s: bajt %s: %s %.*s… je příliÅ¡ dlouhý" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" msgstr "NeoÄekávaný konec souboru snímku" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" -msgstr "" +msgstr "%s: bajt %s: %s %s je následován neplatným bajtem 0x%02x" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" +"%s: bajt %s: (platný rozsah %s–%s)\n" +"\t%s %s" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" -msgstr "" +msgstr "%s: bajt %s: %s %s" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" -msgstr "" +msgstr "%s: bajt %s: %s" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "Chybí uzávÄ›r záznamu" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "Chybný formát přírůstkového souboru" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "Nepodporovaná verze přírůstkového formátu: %" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "PoÅ¡kozený dumpdir: oÄekáváno „%c“, ale nalezeno %#3o" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "PoÅ¡kozený dumpdir: „X“ duplikováno" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "PoÅ¡kozený dumpdir: prázdný název v „R“" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "PoÅ¡kozený dumpdir: „R“ není pÅ™ed „T“" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "PoÅ¡kozený dumpdir: prázdný název v „T“" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "PoÅ¡kozený dumpdir: oÄekáváno „%c“, ale zjiÅ¡tÄ›n konec dat" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "PoÅ¡kozený dumpdir: „X“ nebylo nikdy použito" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Podle Å¡ablony %s nelze vytvoÅ™it doÄasný adresář" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Adresář nebude vyÄiÅ¡tÄ›n: nelze provést stat()" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: adresář je na jiném zařízení: nebude vyÄiÅ¡tÄ›n" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Mažu %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: Nelze smazat" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: Vynechávám" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "blok %s: ** Blok NUL **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Konec souboru **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Mezery v hlaviÄce na místÄ›, kde je oÄekávána Äíselná hodnota typu %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" "OsmiÄková hodnota %.*s typu %s je mimo rozsah; pÅ™iÅ™azuji dvojkový complement" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "OsmiÄková hodnota %.*s typu %s je mimo rozsah" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "Archiv obsahuje zastaralé base-64 hlaviÄky" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Base-64 Å™etÄ›zec %s je mimo rozsah typu %s" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Hodnota base-256 je mimo rozsah typu %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Archiv obsahuje %.*s tam, kde je oÄekávána Äíselná hodnota typu %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Hodnota %s typu %s je mimo rozsah %s..%s" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " odkaz na %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " neznámý souborový typ %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--Dlouhý odkaz--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--Dlouhý název--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--HlaviÄka svazku--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--PokraÄováno od %s bajtu--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Vytvářím adresář:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "PÅ™ejmenovávám %s na %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: nelze pÅ™ejmenovat na %s" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "PÅ™ejmenovávám %s zpÄ›t na %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Soubor smazán dříve než mohl být pÅ™eÄten" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "potomek" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "meziprocesový kanál" #: src/names.c:360 -#, fuzzy msgid "command line" -msgstr "příkaz %s selhal" +msgstr "příkazový řádek" #: src/names.c:378 -#, fuzzy, c-format +#, c-format msgid "%s: file list requested from %s already read from %s" -msgstr "%s: seznam souborů již naÄten" +msgstr "%s: seznam souborů požadovaný z %s již naÄten z %s" -#: src/names.c:448 -#, fuzzy, c-format +#: src/names.c:448 src/checkpoint.c:274 +#, c-format msgid "cannot split string '%s': %s" -msgstr "Souboru „%s“ nelze nastavit Äas" +msgstr "Å™etÄ›zec „%s“ nelze rozdÄ›lit: %s" #: src/names.c:490 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: naÄtený název souboru obsahuje nulový znak" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "V názvech souborů se nachází žolíkové znaky" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1375,56 +1383,55 @@ msgstr "" "Porovnávání proti žolíkových znaků zapnÄ›te pomocí --wildcards, nebo varování " "potlaÄte prostÅ™ednictvím --no-wildcards" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: V archivu nenalezen" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Požadovaný výskyt nebyl v archivu nalezen" -#: src/names.c:876 +#: src/names.c:879 #, c-format msgid "Archive label mismatch" msgstr "Název archivu se neodpovídá" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "Použití pÅ™epínaÄe -C uvnitÅ™ seznamu souborů není spolu s --listed-" "incremental dovoleno" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "S --listed-incremental je dovolen pouze jediný pÅ™epínaÄ -C" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" -msgstr "PÅ™epínaÄe „-%s“ a „-%s“ oba dva chtÄ›jí standardní vstup" +msgid "Options '%s' and '%s' both want standard input" +msgstr "Oba dva pÅ™epínaÄe „-%s“ a „-%s“ chtÄ›jí standardní vstup" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s: Neplatný formát archivu" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "GNU rozšíření požadovány na nekompatibilním formátu archivu" -#: src/tar.c:255 -#, fuzzy, c-format +#: src/tar.c:264 +#, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." msgstr "" "Neznámý styl citování „%s“. Seznam stylů lze získat příkazem „%s --quoting-" "style=help“." -#: src/tar.c:364 -#, fuzzy +#: src/tar.c:378 msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1443,8 +1450,7 @@ msgstr "" "tar.\n" " tar -xf archiv.tar # Rozbalí vÅ¡echny soubory z archiv.tar.\n" -#: src/tar.c:373 -#, fuzzy +#: src/tar.c:387 msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" "The version control may be set with --backup or VERSION_CONTROL, values " @@ -1466,79 +1472,79 @@ msgstr "" " existují, jinak tvoří jednoduché\n" " never, simple tvoří vždy jednoduché záložní kopie souborů\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "Hlavní operaÄní režim:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "vypíše obsah archivu" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "vybalí soubory z archivu" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "vytvoří nový archiv" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "hledá rozdíly mezi archivem a systémem souborů" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "pÅ™ipojí soubory na konec archivu" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "pÅ™ipojí jen takové soubory, které jsou novÄ›jší nežli kopie v archivu" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "pÅ™ipojí k archivu tarové soubory" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "smaže z archivu (ne na magnetických páskách!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "otestuje jmenovku archivního svazku a skonÄí" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "OperaÄní modifikátory:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "zachází s řídkými soubory efektivnÄ›" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "HLAVNÃ[.VEDLEJÅ Ã]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "nastaví verzi řídkého formátu (implikuje --sparse)" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "zpracuje přírůstkové zálohy starého formátu GNU" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "zpracuje přírůstkové zálohy nového formátu GNU" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "úroveň výpisu pro vytvářený archiv s přírůstkovým seznamem" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "neskoÄní nenulovým kódem pÅ™i neÄitelných souborech" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1550,132 +1556,137 @@ msgstr "" "--list a jen když je zadán seznam souborů na příkazovém řádku nebo pÅ™es " "pÅ™epínaÄ -T; implicitní ÄŒÃSLO je 1" -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "v archivu se lze posunovat" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "v archivu se lze posunovat" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "pÅ™i vytváření přírůstkových archivů se nekontrolují Äísla zařízení" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" "pÅ™i vytváření přírůstkových archivů se kontrolují Äísla zařízení (implicitní)" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "Ovládání pÅ™episování:" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "pokusí se zkontrolovat archiv po té, co bude zapsán" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "odstraní soubory po té, co budou pÅ™idány do archivu" -#: src/tar.c:471 -#, fuzzy +#: src/tar.c:485 msgid "don't replace existing files when extracting, treat them as errors" -msgstr "pÅ™i rozbalovaní nenahrazuje existující soubory" +msgstr "pÅ™i rozbalovaní nenahrazuje existující soubory, považuje je za chyby" -#: src/tar.c:474 -#, fuzzy +#: src/tar.c:488 msgid "don't replace existing files when extracting, silently skip over them" -msgstr "pÅ™i rozbalovaní nenahrazuje existující soubory" +msgstr "pÅ™i rozbalovaní nenahrazuje existující soubory, potichu je pÅ™eskoÄí" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "" "nenahrazuje existující soubory, které jsou novÄ›jší než jejich archivní kopie" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "pÅ™i rozbalování existující soubory pÅ™episuje" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "pÅ™ed vybalením každého souboru jej odstraní" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "pÅ™ed vybalením adresáře vytvoří prázdnou hierarchii" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "zachovává metadata existujících adresářů" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "pÅ™i rozbalování pÅ™episuje metadata existujících adresářů (implicitní)" -#: src/tar.c:490 -#, fuzzy +#: src/tar.c:504 msgid "preserve existing symlinks to directories when extracting" -msgstr "pÅ™i rozbalování existující soubory pÅ™episuje" +msgstr "pÅ™i rozbalování zachovává existující symbolické odkazy na adresáře" + +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "ADRESÃŘ" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" -#: src/tar.c:496 +#: src/tar.c:513 msgid "Select output stream:" msgstr "VýbÄ›r výstupního proudu:" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "soubory vybaluje na standardní výstup" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "PŘÃKAZ" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "vybalené soubory poÅ¡le rourou jinému programu" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "ignoruje návratový kód potomků" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "nenulový návratový kód potomků považuje za chybu" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Zacházení s atributy souborů:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "vynutí JMÉNO jako vlastníka vkládaných souborů" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "vynutí JMÉNO jako skupinu vkládaných souborů" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "DATUM_NEBO_SOUBOR" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "nastaví Äas zmÄ›ny obsahu vkládaných souborů podle DATA_NEBO_SOUBORU" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "ZMÄšNY" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "vynutí (symbolický) mód ZMÄšN (přístupová práva) vkládaným souborům" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "METODA" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " @@ -1685,11 +1696,11 @@ msgstr "" "(METODA=„REPLACE“; implicitní), nebo nenastavením Äasů v prvním poÅ™adí " "(METODA=„system“)" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "nevybaluje Äas zmÄ›ny obsahu souboru" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" @@ -1697,19 +1708,19 @@ msgstr "" "pokusí se vybalit soubory se stejným vlastníkem jako je uveden v archivu " "(výchozí pro superuživatele)" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "rozbaluje soubory pod vaší identitou (výchozí pro běžného uživatele)" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "pro jména uživatel/skupin vždy použije Äísla" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "vybaluje informace o právech souborů (implicitní pro superuživatele)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1717,16 +1728,16 @@ msgstr "" "pÅ™i vybalování práv z archivu použije uživatelovu umask (implicitní pro " "běžné uživatele)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" -msgstr "" +msgstr "argumenty prvku se vypisují ve stejném poÅ™adí jako soubory v archivu" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "stejné jako -p -s" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1734,180 +1745,187 @@ msgstr "" "pozdrží nastavení Äasů modifikace a práv rozbalovaných adresářů až do " "dokonÄení rozbalování" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "zruší úÄinek pÅ™epínaÄe --delay-directory-restore" -#: src/tar.c:554 -#, fuzzy +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 msgid "Handling of extended file attributes:" -msgstr "Zacházení s atributy souborů:" +msgstr "Zacházení s rozšířenými atributy souborů:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" -msgstr "" +msgstr "Zapne podporu rozšířených atributů" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" -msgstr "" +msgstr "Vypne podporu rozšířených atributů" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" -msgstr "" +msgstr "MASKA" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" -msgstr "" +msgstr "urÄuje vzor klíÄů rozšířených atributů k zahrnutí" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" -msgstr "" +msgstr "urÄuje vzor klíÄů rozšířených atributů k vylouÄení" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" -msgstr "" +msgstr "Zapne podporu pro kontext SELinuxu" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" -msgstr "" +msgstr "Vypne podporu pro kontext SELinuxu" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" -msgstr "" +msgstr "Zapne podporu pro posixové ACL" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" -msgstr "" +msgstr "Vypne podporu pro posixové ACL" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "VýbÄ›r a pÅ™epínání zařízení:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ARCHIV" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "pro archiv požije soubor zařízení ARCHIV" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "soubor archivu je místní, i když obsahuje dvojteÄku" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "namísto příkazu rmt použije PŘÃKAZ" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "namísto rsh použije PŘÃKAZ" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "urÄuje mechaniku a hustotu" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "vytvoří/vypíše/rozbalí vícesvazkový archiv" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "po zapsaní ÄŒÃSLO × 1024 bajtů vymÄ›ní pásku" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "na konci každé pásky spustí skript (implikuje -M)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "použije/aktualizuje Äíslo svazku v SOUBORU" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "Bloky zařízení:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "BLOKY" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "BLOKÅ® × 512 bajtů na záznam" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "ÄŒÃSLO bajtů na záznam, násobek 512" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "v archivu ignoruje vynulované bloky (znamená EOF)" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "pÅ™edÄ›lat bloky v průbÄ›hu Ätení (pro roury na BSD 4.2)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "VýbÄ›r formátu archivu:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "FORMÃT" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "vytvoří archiv daného formátu" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "FORMÃT je jeden z následujících:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "starý formát taru V7" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "formát taru GNU <= 1.12" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "formát taru GNU 1.13.x" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "formát POSIX 1003.1-1988 (ustar)" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "formát POSIX 1003.1-2001 (pax)" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "stejné jako pax" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "stejné jako --format=v7" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "stejné jako --format=posix" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "klíÄové_slovo[[:]=hodnota][,klíÄové_slovo[[:]=hodnota]]…" -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "řídicí klíÄová slova paxu" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "TEXT" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1915,77 +1933,75 @@ msgstr "" "vytvoří archiv s názvem svazku TEXT; pÅ™i výpisu/rozbalení použije TEXT jako " "vzor se zástupnými symboly pro název svazku" -#: src/tar.c:660 +#: src/tar.c:684 msgid "Compression options:" msgstr "PÅ™epínaÄe komprese:" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "kompresní program urÄí podle přípony archivu" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "kompresní program neurÄí podle přípony archivu" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "PROGRAM" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "archiv protáhne PROGRAMEM (musí znát -d)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "VýbÄ›r místního souboru:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" "zadaný SOUBOR pÅ™idá do archivu (užiteÄné, zaÄíná-li jeho název spojovníkem)" -#: src/tar.c:687 -msgid "DIR" -msgstr "ADRESÃŘ" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "zmÄ›ní adresář na ADRESÃŘ" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "seznam jmen souborů na rozbalení nebo zabalení získá ze SOUBORU" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "-T Äte názvy zakonÄené nulovým znakem, vypne -C" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "zruší úÄinek pÅ™edchozího pÅ™epínaÄe --null" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" msgstr "" "odÄiní citování (escapování) názvů souboru naÄtených pÅ™es -T (implicitní)" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" msgstr "nezruší citování (escapování) názvů souboru naÄtených pÅ™es -T" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "VZOR" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "vynechá soubory, které odpovídají VZORU" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "vynechá soubory vyjmenované v SOUBORU" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1993,97 +2009,109 @@ msgstr "" "vynechá obsah adresářů obsahujících CACHEADR.ZNAÄŒKA, kromÄ› souboru znaÄky " "samotného" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "vynechá vÅ¡e pod adresáři obsahujícími CACHEADR.ZNAÄŒKA" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "vynechá adresáře obsahující CACHEADR.ZNAÄŒKA" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "vynechá obsah adresářů obsahujících SOUBOR, vyjma SOUBORU samotného" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "vynechá vÅ¡e pod adresáři obsahujícími SOUBOR" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "vynechá adresáře obsahující SOUBOR" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "vynechá adresáře systému správy verzí" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "vynechá soubory záloh a zámků" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "zabrání automatickému sestupu do adresářů" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "pÅ™i tvorbÄ› archivu se zdrží v místním systému souborů" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "sestupuje rekurzivnÄ› do adresářů (implicitní)" -#: src/tar.c:729 -#, fuzzy +#: src/tar.c:761 msgid "don't strip leading '/'s from file names" msgstr "neodstraní z názvů souborů úvodní „/“" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "" "následuje symbolické odkazy; archivuje a vybaluje soubory, na které je " "odkazováno" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "" "následuje pevné odkazy; archivuje a vybaluje soubory, na které je odkazováno" # Äást cesty (adresář) -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "SLOŽKA_NÃZVU" -#: src/tar.c:735 -#, fuzzy +#: src/tar.c:767 msgid "begin at member MEMBER-NAME when reading the archive" -msgstr "zaÄne v archivu na složce SLOŽKA_NÃZVU" +msgstr "Ätení archivu zaÄne na složce SLOŽKA_NÃZVU" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "ukládá jen soubory novÄ›jší než DATUM_NEBO_SOUBOR" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "DATUM" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "pÅ™i zmÄ›nÄ› dat porovná datum i Äas" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "STRATEGIE" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "pÅ™ed odstranÄ›ním vytvoří záložní kopii za použití STRATEGIE" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "ŘETÄšZEC" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -2091,100 +2119,97 @@ msgstr "" "pÅ™ed odstranÄ›ním vytvoří záložní kopii, potlaÄí obvyklou příponu („~“, není-" "li uvedeno jinak v promÄ›nné prostÅ™edí SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "Transformace názvů souborů:" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "pÅ™i rozbalování odřízne ÄŒÃSLO úvodních složek z názvů souborů" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "VÃRAZ" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "názvy souborů transformuje pomocí nahrazovacího VÃRAZU sedu" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "PÅ™epínaÄe řídicí výbÄ›r souborů podle názvu (ovlivňuje vzory jak pro " "vylouÄení, tak pro zahrnutí)" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "ignoruje velikost písmen" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "vzory se testují název souboru od zaÄátku" -#: src/tar.c:767 -#, fuzzy +#: src/tar.c:799 msgid "patterns match after any '/' (default for exclusion)" msgstr "vzory se testují po každém „/“ (implicitní u vylouÄení)" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "testování je citlivé na velikost (implicitní)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "použije žolíkové znaky (implicitní u vylouÄení)" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "testuje se pÅ™esný Å™etÄ›zec" -#: src/tar.c:775 -#, fuzzy +#: src/tar.c:807 msgid "wildcards do not match '/'" msgstr "žolíkové znaky nezahrnují „/“" -#: src/tar.c:777 -#, fuzzy +#: src/tar.c:809 msgid "wildcards match '/' (default for exclusion)" msgstr "žolíkové znaky zahrnují „/“ (implicitní u vylouÄení)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Informativní výstup:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "vypisuje zpracovávané soubory" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "KLÃÄŒOVÉ_SLOVO" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "řídí varování" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "zobrazuje zprávy o postupu každých ÄŒÃSLO. záznam (implicitnÄ› 10)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "AKCE" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "v každém kontrolním bodu vykoná AKCI" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "hlásí, že nebyly zpracovány vÅ¡echny odkazy" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "SIGNÃL" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2195,35 +2220,35 @@ msgstr "" "hlášení, až bude doruÄen SIGNÃL; Povolené signály jsou SIGHUP, SIGQUIT, " "SIGINT, SIGUSR1 a SIGUSR2; názvy bez pÅ™edpony SIG jsou rovněž přípustné" -#: src/tar.c:802 +#: src/tar.c:834 msgid "print file modification times in UTC" msgstr "Äasy zmÄ›n obsahu souborů vypisuje v UTC" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "Äasy souborů vypisuje v plném znÄ›ní" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "informativní výstup poÅ¡le do SOUBORU" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "každou zprávu opatří Äíslem bloku uvnitÅ™ archivu" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "na každou akcí žádá potvrzení" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "zobrazí implicitní argumenty taru" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" -msgstr "" +msgstr "zobrazí platné rozsahy pro položky souborů snímků" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2231,31 +2256,31 @@ msgstr "" "pÅ™i vypisování nebo rozbalování zobrazí každý adresář, který neodpovídá " "vyhledávacím podmínkám" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "zobrazuje názvy souborů a archivů po transformaci" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "STYL" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "nastaví styl citování názvů; platné hodnoty STYLÅ® nalezte níže" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "cituje navíc znaky z ŘETÄšZCE" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "zakáže citování znaků z ŘETÄšZCE" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "PÅ™epínaÄe pro kompatibilitu" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2263,56 +2288,56 @@ msgstr "" "pÅ™i vytváření archivu má stejný význam jako --old-archive, pÅ™i rozbalování " "jako --no-same-owner" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "Další pÅ™epínaÄe:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "zakáže použití nÄ›kterých potenciálnÄ› nebezpeÄných pÅ™epínaÄů" -#: src/tar.c:978 -#, fuzzy +#: src/tar.c:1010 msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" msgstr "" -"Nemůže být zadán více jak jeden pÅ™epínaÄ z „-Acdtrux“ nebo „--test-label“" +"Nemůže být zadán více jak jeden pÅ™epínaÄ z „-Acdtrux“, „--delete“ nebo „--" +"test-label“" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Odporující si kompresní pÅ™epínaÄe" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "Neznámý název signálu: %s" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "Soubor, ze kterého se má vzít datum a Äas, nebyl nalezen" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Datum neznámého formátu %2$s nahrazuji %1$s" -#: src/tar.c:1108 -#, fuzzy, c-format +#: src/tar.c:1140 +#, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "PÅ™epínaÄ %s: S datem „%s“ bude zacházeno jako s %s" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "archiv protáhne skrze filtr %s" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "Pro pÅ™epínaÄ --quoting-style jsou platné argumenty:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2320,48 +2345,47 @@ msgstr "" "\n" "Implicitní pÅ™epínaÄe *tohoto* taru:\n" -#: src/tar.c:1295 -#, fuzzy +#: src/tar.c:1330 msgid "Invalid owner or group ID" -msgstr "Neplatný vlastník" +msgstr "Neplatné ID vlastníka nebo skupiny" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Neplatný poÄet bajtů na záznam" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "Neplatná délka pásky" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "Chybná hodnota úrovnÄ› přírůstku" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "Více než jedeno poÄáteÄní datum" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "Neplatná hodnota verze řídkého formátu" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' není na této platformÄ› podporován" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "hodnota --checkpoint není celé Äíslo" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Zadána chybná práva" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "Neplatné Äíslo" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" @@ -2369,70 +2393,67 @@ msgstr "" "PÅ™epínaÄ --preserve je zastaralý, místo nÄ›j používejte --preserve-" "permissions --preserve-order" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Chybná velikost záznamu" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "Velikost záznamu musí být násobek %d." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "Neplatný poÄet prvků" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "Povolen je jen jeden pÅ™epínaÄ --to-command" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "Neplatný argument hustoty: %s" -#: src/tar.c:2133 -#, fuzzy, c-format +#: src/tar.c:2205 +#, c-format msgid "Unknown density: '%c'" msgstr "Neznámá hustota: „%c“" -#: src/tar.c:2150 -#, fuzzy, c-format +#: src/tar.c:2222 +#, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "PÅ™epínaÄe „-[0-7][lmh]“ nejsou *tímto* tarem podporovány" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[SOUBOR]…" -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 #, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "PÅ™epínaÄ --%s nelze použít s %s" + +#: src/tar.c:2389 +#, c-format msgid "Old option '%c' requires an argument." -msgstr "PÅ™epínaÄ â€ž%c“ vyžaduje argument." +msgstr "Starý pÅ™epínaÄ â€ž%c“ vyžaduje argument." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "bez seznamu souborů nemá --occurrence smysl" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "--occurrence nelze v požadovaném režimu operace použít" - -#: src/tar.c:2408 -#, fuzzy +#: src/tar.c:2490 msgid "Multiple archive files require '-M' option" msgstr "Více archivaÄních souborů vyžaduje pÅ™epínaÄ â€ž-M“" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "--listed-incremental a --newer nelze kombinovat" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "--level bez --listed-incremental postrádá smysl" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" @@ -2440,79 +2461,71 @@ msgstr[0] "%s: Název svazku je příliÅ¡ dlouhý (limit je %'lu bajt)" msgstr[1] "%s: Název svazku je příliÅ¡ dlouhý (limit je %'lu bajty)" msgstr[2] "%s: Název svazku je příliÅ¡ dlouhý (limit je %'lu bajtů)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Vícesvazkový archiv není možné ověřit" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Komprimovaný archiv nelze ověřit" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "Vzor %s nelze použít" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Vícesvazkový komprimovaný archiv nelze vytvoÅ™it" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "Komprimované archivy nelze zÅ™etÄ›zit" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "PÅ™epínaÄ --pax-option lze použít jen na posixových archivech" -#: src/tar.c:2478 -#, fuzzy +#: src/tar.c:2560 msgid "--acls can be used only on POSIX archives" -msgstr "PÅ™epínaÄ --pax-option lze použít jen na posixových archivech" +msgstr "PÅ™epínaÄ --acls lze použít jen na posixových archivech" -#: src/tar.c:2483 -#, fuzzy +#: src/tar.c:2565 msgid "--selinux can be used only on POSIX archives" -msgstr "PÅ™epínaÄ --pax-option lze použít jen na posixových archivech" +msgstr "PÅ™epínaÄ --selinux lze použít jen na posixových archivech" -#: src/tar.c:2488 -#, fuzzy +#: src/tar.c:2570 msgid "--xattrs can be used only on POSIX archives" -msgstr "PÅ™epínaÄ --pax-option lze použít jen na posixových archivech" +msgstr "PÅ™epínaÄ --xattrs lze použít jen na posixových archivech" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "Vzor %s nelze použít" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" +msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "Délka svazku nemůže být kratší než délka záznamu" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "--preserve-order není sluÄitelný s --listed-incremental" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "VytvoÅ™ení prázdného archivu odmítnuto." -#: src/tar.c:2565 -#, fuzzy +#: src/tar.c:2669 msgid "Options '-Aru' are incompatible with '-f -'" msgstr "PÅ™epínaÄe „-Aru“ jsou nesluÄitelné s pÅ™epínaÄem „-f -“" -#: src/tar.c:2660 -#, fuzzy +#: src/tar.c:2766 msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" -msgstr "Musíte zadat jeden z pÅ™epínaÄů „-Acdtrux“ nebo „--test-label“" +msgstr "" +"Musíte zadat jeden z pÅ™epínaÄů „-Acdtrux“, „--delete“ nebo „--test-label“" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "KonÄí se chybovým kódem, protože byly zaznamenány chyby" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" @@ -2521,52 +2534,52 @@ msgstr[0] "%s: Soubor zkrácen o %s bajt" msgstr[1] "%s: Soubor zkrácen o %s bajty" msgstr[2] "%s: Soubor zkrácen o %s bajtů" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "KlíÄové slovo %s není známo nebo jeÅ¡tÄ› nebylo implementováno" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" msgstr "ÄŒasový údaj je mimo povolený rozsah" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "Vzor %s nelze použít" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "KlíÄové slovo %s nelze pÅ™ebít" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "Chybná rozšířená hlaviÄka: chybí délka" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "Délka rozšířené hlaviÄky %*s je mimo rozsah" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "Chybná rozšířená hlaviÄka: po délce chybí bílé místo" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "Chybná rozšířená hlaviÄka: chybí znak rovná se" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "Chybná rozšířená hlaviÄka: chybí odřádkování" -#: src/xheader.c:740 -#, fuzzy, c-format +#: src/xheader.c:741 +#, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "Ignoruje se neznámé klíÄové slovo „%s“ rozšířené hlaviÄky" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" @@ -2575,46 +2588,46 @@ msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "%s=%s v rozšířené hlaviÄce je mimo rozsah %s–%s" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Chybná rozšířená hlaviÄka: %s=%s není platné" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Chybná rozšířená hlaviÄka: nadbyteÄná %s=%s" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "Chybná rozšířená hlaviÄka: neplatný %s: neoÄekávaný oddÄ›lovaÄ %c" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "Chybná rozšířená hlaviÄka: neplatný %s: lichý poÄet hodnot" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "%s: neplatný Äasový limit" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "%s: neznámá akce kontrolního bodu" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "zápis" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "Ätení" @@ -2622,7 +2635,7 @@ msgstr "Ätení" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "Kontrolní bod zápisu %u" @@ -2631,7 +2644,7 @@ msgstr "Kontrolní bod zápisu %u" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "Kontrolní bod Ätení %u" @@ -2841,14 +2854,14 @@ msgid "cannot set time on `%s'" msgstr "Souboru „%s“ nelze nastavit Äas" #: tests/genfile.c:692 -#, fuzzy, c-format +#, c-format msgid "cannot truncate `%s'" -msgstr "„%s“ nelze odstranit (unlink)" +msgstr "„%s“ nelze zkrátit" #: tests/genfile.c:701 -#, fuzzy, c-format +#, c-format msgid "command failed: %s" -msgstr "příkaz %s selhal" +msgstr "příkaz selhal: %s" #: tests/genfile.c:706 #, c-format @@ -2890,11 +2903,17 @@ msgstr "Příkaz ukonÄen\n" msgid "--stat requires file names" msgstr "--stat potÅ™ebuje název souboru" -#~ msgid "Cannot get working directory" -#~ msgstr "Nelze zjistit pracovní adresář" +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "--occurrence nelze použít s %s" -#~ msgid "sort names to extract to match archive" -#~ msgstr "pÅ™i rozbalování seÅ™adí názvy tak, aby odpovídaly poÅ™adí v archivu" +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "--listed-incremental a --newer nelze kombinovat" + +#~ msgid "--verify cannot be used with %s" +#~ msgstr "PÅ™epínaÄ --verify nelze použít s %s" + +#~ msgid "--preserve-order is not compatible with --listed-incremental" +#~ msgstr "--preserve-order není sluÄitelný s --listed-incremental" #~ msgid "Field too long while reading snapshot file" #~ msgstr "PÅ™i Ätení souboru snímku: položka je příliÅ¡ dlouhá" @@ -2905,12 +2924,18 @@ msgstr "--stat potÅ™ebuje název souboru" #~ msgid "Unexpected field value in snapshot file" #~ msgstr "NeoÄekávaná hodnota položky v souboru snímku" -#~ msgid "Extended header length is out of allowed range" -#~ msgstr "Délka rozšířené hlaviÄky je mimo povolený rozsah" +#~ msgid "Cannot get working directory" +#~ msgstr "Nelze zjistit pracovní adresář" + +#~ msgid "sort names to extract to match archive" +#~ msgstr "pÅ™i rozbalování seÅ™adí názvy tak, aby odpovídaly poÅ™adí v archivu" #~ msgid "Invalid group" #~ msgstr "Neplatná skupina" +#~ msgid "Extended header length is out of allowed range" +#~ msgstr "Délka rozšířené hlaviÄky je mimo povolený rozsah" + #~ msgid "%s: Directory removed before we read it" #~ msgstr "%s: Adresář smazán dříve než mohl být pÅ™eÄten" diff --git a/po/da.gmo b/po/da.gmo index 4ff9102..f08185b 100644 Binary files a/po/da.gmo and b/po/da.gmo differ diff --git a/po/da.po b/po/da.po index 886af04..cad028a 100644 --- a/po/da.po +++ b/po/da.po @@ -5,12 +5,12 @@ # Claus Hindsgaul , 2001. # Keld Jørn Simonsen , 2000-2001,2009,2010. # Keld Simonsen , 2010-2011. -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" "Project-Id-Version: GNU tar 1.26\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" "PO-Revision-Date: 2011-04-12 10:18+0100\n" "Last-Translator: Keld Simonsen \n" "Language-Team: Danish \n" @@ -102,7 +102,7 @@ msgstr "vis denne hj msgid "give a short usage message" msgstr "vis en kort hjælpemeddelelse" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "NAVN" @@ -435,7 +435,7 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: Funktionen %s fejlede" @@ -444,56 +444,56 @@ msgstr "%s: Funktionen %s fejlede" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: Advarsel: Kan ikke %s" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: Kan ikke ændre modus til %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: Kan ikke ændre ejerskab til bruger-ID %lu, gruppe-ID %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: Kan ikke oprette lænke til %s" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Læsefejl ved byte %s ved læsning af %lu byte" msgstr[1] "%s: Læsefejl ved byte %s ved læsning af %lu byte" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Advarsel: Læsefejl ved byte %s ved læsning af %lu byte" msgstr[1] "%s: Advarsel: Læsefejl ved byte %s ved læsning af %lu byte" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: Kan ikke søge til %s" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: Advarsel: Kan ikke søge til %s" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: Kan ikke oprette symbolsk lænke til '%s'" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -592,8 +592,8 @@ msgstr "Uventede argumenter" msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "Styr en båndstation via accept af kommandoer fra en fjernproces" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "NUMMER" @@ -601,10 +601,10 @@ msgstr "NUMMER" msgid "set debug level" msgstr "sæt fejlsøgningsniveau" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "FIL" @@ -626,103 +626,111 @@ msgstr "for mange argumenter" msgid "Garbage command" msgstr "Ugyldig kommando" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Dette ligner ikke et tar-arkiv" -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" -msgstr "Totalt antal byte skrevet" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" msgstr "Totalt antal byte læst" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "Totalt antal byte skrevet" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Totalt antal byte slettet: %s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(datakanal)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "Ugyldig værdi for record_size" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Arkivnavn er ikke opgivet" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Kan ikke verificere standard-ind/standard-ud arkiver" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Arkivet er komprimeret. Brug flaget %s" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Kan ikke opdatere komprimerede arkiver" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "Ved begyndelsen af båndet, afslutter nu" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "For mange fejl, afslutter" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Poststørrelse = %lu blok" msgstr[1] "Poststørrelse = %lu blokke" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "Ikke-justeret blok (%lu byte) i arkiv" msgstr[1] "Ikke-justerede blokke (%lu byte) i arkiv" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "Kunne ikke gå tilbage i arkivfilen. Den kan være ulæselig uden -i" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek stoppede ikke på en postgrænse" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: indeholder ugyldigt delarkivs-nummer" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "Overløb på delarkiv-nummer" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Klargør delarkiv nummer %d for %s og tryk retur: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "Filafslutning hvor svar fra bruger var forventet" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "ADVARSEL: Arkivet er ufuldstændigt" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -734,66 +742,66 @@ msgstr "" " q Afbryd tar\n" " y eller ny linje Fortsæt handling\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Start en ny skál\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? Udskriv denne liste\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Intet nyt delarkiv; afslutter.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "Filnavn ikke angivet, prøv igen.\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Ugyldigt inddata. Skriv ? for at få hjælp.\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "'%s'-kommando mislykkedes" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" "%s fortsættes muligvis i dette delarkiv: hoved indeholder afkortet navn" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s fortsætter ikke i dette delarkiv" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s har forkert størrelse (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Dette delarkiv er ude af rækkefølge (%s - %s != %s)" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "Arkivet er ikke navngivet til at passe med %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "Delarkivet '%s' stemmer ikke overens med %s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -801,7 +809,7 @@ msgstr "" "%s: filnavnet er for langt til at gemmes i hovedet på et GNU-flerdelarkiv, " "afkortes" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "skrivning stoppede ikke på en blokgrænse" @@ -812,16 +820,16 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Kunne kun læse %lu af %lu byte" msgstr[1] "Kunne kun læse %lu af %lu byte" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "Indhold er forskelligt" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "Uventet filslutning i arkivet" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "Filtype er forskellig" @@ -841,7 +849,7 @@ msgstr "Gruppe-ID er forskellig" msgid "Mod time differs" msgstr "Modificeringstid er forskellig" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Størrelse er forskellig" @@ -858,36 +866,36 @@ msgstr "Symbolsk l msgid "Device number differs" msgstr "Enhedsnummer er forskellig" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Verificér " -#: src/compare.c:471 +#: src/compare.c:473 #, fuzzy, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "%s: Ukendt filtype '%c', diff'et som en almindelig fil" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "Arkivet indeholder filnavne med indledende prefixer borttaget." -#: src/compare.c:533 +#: src/compare.c:535 msgid "Archive contains transformed file names." msgstr "Arkiv indeholder transformerede filnavne." -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "Verificering kan mislykkes med at finde originalfiler." -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "VERIFICERINGSFEJL: %d ukendt hoved fundet" msgstr[1] "VERIFICERINGSFEJL: %d ukendte hoveder fundet" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "En enkeltstående nulblok ved %s" @@ -933,55 +941,55 @@ msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "%s: Filen formindsket med %s byte, fylder ud med nul" msgstr[1] "%s: Filen formindsket med %s byte, fylder ud med nuller" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: fil er på et andet filesystem; ikke arkiveret" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "indholdet ikke arkiveret" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Ukendt filtype; filen blev ignoreret" -#: src/create.c:1549 +#: src/create.c:1551 #, c-format msgid "Missing links to %s." msgstr "Mangler lænke til %s." -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: fil er uændret; ikke arkiveret" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: fil er det samme som arkivet; ikke arkiveret" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "katalog ikke arkiveret" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: Fil ændredes mens vi læste den" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: sokkel ignoreret" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: dør ignoreret" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Hopper til næste hoved" @@ -1027,7 +1035,7 @@ msgstr "Fors msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Kan ikke udpakke -- filen er fortsat fra et andet delarkiv" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" msgstr "Uventet langt filnavnshoved" @@ -1071,252 +1079,252 @@ msgstr "%s: fil er p msgid "%s: Directory has been renamed" msgstr "%s: Kataloget er blevet omdøbt" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "Ugyldigt tidsstempel" -#: src/incremen.c:1045 +#: src/incremen.c:1047 #, fuzzy msgid "Invalid modification time" msgstr "Ugyldig modifikationstid (sekunder)" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "Ugyldig modifikationstid (nanosekunder)" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "Ugyldigt enhedsnummer" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Ugyldigt inode-nummer" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" msgstr "" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" msgstr "Uventet filslutning i øjebliksfil" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" msgstr "" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" msgstr "" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "Postafslutning mangler" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "Fejlagtigt inkrementelt filformat" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "" "Formatversion for inkrementel sikkerhedskopiering understøttes ikke: " "%" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Fejlagtigt dumpkatalog: forventede \"%c\" men fandt %#3o" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Fejlagtigt dumpkatalog: \"X\" duplikeret" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Fejlagtigt dumpkatalog: tomt navn i \"R\"" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Fejlagtigt dumpkatalog: \"T\" foregås ikke af \"R\"" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Fejlagtigt dumpkatalog: tomt navn i \"T\"" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "Fejlagtigt dumpkatalog: forventede \"%c\" men fandt slut på data" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "Fejlagtigt dumpkatalog: \"X\" bruges aldrig" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "kan ikke oprette midlertidigt katalog ved brug af skabelonen %s" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Renser ikke katalog: kunne ikke tage status" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: fil er på et andet filesystem: sletter ikke" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Sletter %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "Kan ikke slette %s" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: Udelader" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "blok %s: ** Blok med NULler **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Slut på fil **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Blank-tegn i hovedet hvor numerisk %s værdi var forventet" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "Oktal værdi %.*s i arkiv er udenfor %s interval; antager to-komplement" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Oktal værdi %.*s i arkiv er udenfor %s interval" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "Arkiv indeholder forældede base-64 hoveder" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Base-64 streng med fortegn %s i arkiv er udenfor %s interval" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Base-256 værdi i arkiv er udenfor %s interval" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Arkiv indeholder %.*s hvor numerisk %s-værdi var forventet" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Arkiv værdi %s er udenfor %s interval %s..%s" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " lænke til %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " ukendt filtype %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--Lang lænke--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--Langt navn--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Delarkivhoved--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Fortsat ved byte %s--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Opretter katalog:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "Omdøber %s til %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Kan ikke omdøbe til %s" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "Omdøber %s tilbage til %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Fil fjernet før vi læste den" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "underproces" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "mellemproces-kanal" @@ -1330,7 +1338,7 @@ msgstr "'%s'-kommando mislykkedes" msgid "%s: file list requested from %s already read from %s" msgstr "%s: filliste allerede læst" -#: src/names.c:448 +#: src/names.c:448 src/checkpoint.c:274 #, fuzzy, c-format msgid "cannot split string '%s': %s" msgstr "kan ikke sætte tid på \"%s\"" @@ -1340,11 +1348,11 @@ msgstr "kan ikke s msgid "%s: file name read contains nul character" msgstr "%s: filnavnet som læstes indeholder nultegn" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "Mønstermatchningstegn bruges i filnavne" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1352,46 +1360,46 @@ msgstr "" "Brug --wildcards for at aktivere mønstermatchning, eller --no-wildcards for " "at undertrykke denne advarsel" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: Ikke fundet i arkivet" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Krævet forekomst blev ikke fundet i arkivet" -#: src/names.c:876 +#: src/names.c:879 #, c-format msgid "Archive label mismatch" msgstr "Arkivetiket stemmer ikke overrens" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "At bruge -C-flaget i en filliste er ikke tilladt med --listed-incremental" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Kun ét -C-flag er tilladt med --listed-incremental" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "Flagene '-%s' and '-%s' vil begge have standard inddata" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s: ugyldigt arkivformat" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "GNU-funktioner forsøgt på inkompatibelt arkiv-format" -#: src/tar.c:255 +#: src/tar.c:264 #, fuzzy, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." @@ -1399,7 +1407,7 @@ msgstr "" "Ukendt citeringsstíl \"%s\". Prøv \"%s --quoting-style=help for at få en " "liste." -#: src/tar.c:364 +#: src/tar.c:378 #, fuzzy msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " @@ -1418,7 +1426,7 @@ msgstr "" " tar -tvf arkiv.tar # Vís alle filer i arkiv.tar udførligt.\n" " tar -xf arkiv.tar # Udpak alle filer fra arkiv.tar.\n" -#: src/tar.c:373 +#: src/tar.c:387 #, fuzzy msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1443,81 +1451,81 @@ msgstr "" " ellers simple\n" " never, simple lav altid simple sikkerhedskopier\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "Hovedoperationstilstand:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "vis indholdet af et arkiv" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "udpak filer fra et arkiv" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "opret et nyt arkiv" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "find forskelle mellem filsystemet og arkivet" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "tilføj filer til slutningen af et arkiv" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "tilføj kun filer som er nyere end dem i arkivet" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "tilføj indholdet i tar-arkivfiler til et arkiv" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "fjern fra arkivet (ikke på magnetbånd!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "verificér arkivets delarkivnavn og afslut derefter." -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "Ændringer til handling:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "håndtér filer med huller effektivt" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "ØVRE[.NEDRE]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" "angiv hvilken formatversion som skal håndtere filer med huller (implicerer --" "sparse)" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "håndtér det gamle GNU-format for inkrementel sikkerhedskopiering" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "håndtér det nye GNU-format for inkrementel sikkerhedskopiering" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "dumpniveau for \"listed-incremental\" arkiv" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "afslut ikke med fejlslutstatus p.g.a. filer, der ikke kan læses" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1529,133 +1537,141 @@ msgstr "" "og når en liste af filer angives enten på kommandolinjen eller med flaget -" "T. Standardværdi for NUMMER er 1." -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "arkivet er søgbart" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "arkivet er ikke søgbart" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "kontrollér ikke enhedsnumre når inkrementelle arkiver oprettes" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" "kontrollér enhedsnumre når inkrementelle arkiver oprettes (standardværdi)" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "Kontrollér overskrivning:" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "forsøg at verificere arkivet efter det blev skrevet" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "fjern filer efter de blev tilføjet til arkivet" -#: src/tar.c:471 +#: src/tar.c:485 #, fuzzy msgid "don't replace existing files when extracting, treat them as errors" msgstr "erstat ikke eksisterende filer ved udpakning" -#: src/tar.c:474 +#: src/tar.c:488 #, fuzzy msgid "don't replace existing files when extracting, silently skip over them" msgstr "erstat ikke eksisterende filer ved udpakning" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "" "erstat ikke eksisterende filer som er nyere end de, som findes i arkivet" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "overskriv eksisterende filer ved udpakning" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "fjern hver eksisterende fil inden en ny udpakkes oven i den" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "tøm kataloghierarkier før udpakning af katalog" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "bevar eksisterende katalogers metadata" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "overskriv metadata for eksisterende kataloger ved udpakning (standardværdi)" -#: src/tar.c:490 +#: src/tar.c:504 #, fuzzy msgid "preserve existing symlinks to directories when extracting" msgstr "overskriv eksisterende filer ved udpakning" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "KATALOG" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "Vælg uddatastrøm:" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "udpak filer til standard-ud" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "KOMMANDO" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "udpak filer til standard input til et andet program" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "ignorér barneprocessers slutstatus" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "behandl slutstatus fra barneprocesser bortset fra 0 som fejl" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Håndtering af filattributter:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "sæt NAVN som ejer for tilføjede filer" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "sæt NAVN som gruppe for tilføjede filer" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "DATO-ELLER-FIL" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "sæt modificeringstid på tilføjede filer fra DATO-ELLER-FIL" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "RETTIGHEDER" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "sæt (symbolske) RETTIGHEDER for tilføjede filer" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "METODE" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " @@ -1665,11 +1681,11 @@ msgstr "" "læsning (METODE=\"replace\", standardværdi) eller ved at ikke sætte tiderne " "overhovedet (METODE=\"system\")" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "udpak ikke filers modificeringstid" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" @@ -1677,20 +1693,20 @@ msgstr "" "forsøg at udpakke filer til samme ejere som i arkivet (standardværdi for " "superbrugeren)" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "" "udpak filer med dig selv som ejer (standardværdi for almindelige brugere)" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "brug altid tal for bruger- og gruppnavn" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "udpak information om filrettigheder (standardværdi for superbrugeren)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1698,16 +1714,16 @@ msgstr "" "anvend brugerens umask når rettigheder udpakkes fra arkivet (standardværdi " "for almindelige brugere)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "samme som både -p og -s" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1715,180 +1731,188 @@ msgstr "" "udsæt sætning af modifikationstider og rettigheder på udpakkede kataloger " "til slutningen på arkivudpakningen." -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "fjern effekten af flaget --delay-directory-restore" -#: src/tar.c:554 +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 #, fuzzy msgid "Handling of extended file attributes:" msgstr "Håndtering af filattributter:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" msgstr "" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" msgstr "" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" msgstr "" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" msgstr "" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" msgstr "" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" msgstr "" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" msgstr "" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" msgstr "" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "Enhedsvalg og enhedsskift:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ARKIV" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "brug arkivfil eller enhed ARKIV" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "arkivfilen er lokal selv om navnet har et kolon" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "brug KOMMANDO i stedet for rmt" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "brug ekstern KOMMANDO i stedet for rsh" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "angiv enhed og densitet" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "opret/vis/udpak et flerdelarkiv" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "skift bånd efter at NUMMER x 1024 byte er skrevet" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "kør kommandofil ved slutningen af hvert bånd (flaget -M sættes også)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "brug/opdatér delarkivnummer i FIL" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "Blokhåndtering:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "BLOK" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "BLOK x 512 byte per post" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "ANTAL byte per post, deleligt med 512" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "ignorér blok med kun nultegn (betyder filslut)" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "lav nye blokke ved læsning (for 4.2BSD-datakanaler)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "Valg af arkivformat:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "FORMAT" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "opret et arkiv med det angivne format" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "FORMAT er et af følgende:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "gammelt V7-format" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "GNU-format for tar <= 1.12" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "Format fra GNU tar 1.13.x" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) format" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) format" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "samme som pax" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "samme som --format=v7" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "samme som --format=posix" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "nøgleord[[:]=værdi][,nøgleord[[:]=værdi]]..." -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "angiv nøgleord for pax" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "TEKST" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1896,75 +1920,73 @@ msgstr "" "opret et arkiv med delarkivnavnet TEKST. Ved visning/udpakning er TEKST et " "skálmønster (\"globbing\") for delarkivnavn" -#: src/tar.c:660 +#: src/tar.c:684 msgid "Compression options:" msgstr "Komprimeringsflag:" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "brug arkivsuffix til at bestemme komprimeringsprogrammet" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "brug ikke arkivsuffix til at bestemme komprimeringsprogrammet" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "PROG" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "filtrér med PROG (skal acceptere -d)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "Lokalt filvalg:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "tilføj angivet FIL til arkivet (brugbart hvis FIL begynder med \"-\")" -#: src/tar.c:687 -msgid "DIR" -msgstr "KATALOG" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "gå til arbejdskatalog KATALOG" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "hent navne at udpakke eller oprette fra FIL" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "-T læser navne adskilt med nultegn, deaktivér -C" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "fjern effekten af foregående --null-flag" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" msgstr "afcitér filnavne som blev læst med -T (standardværdi)" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" msgstr "afcitér ikke filnavne som blev læst med -T" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "MØNSTER" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "udelad filer som matcher MØNSTER" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "udelad filer som matcher mønster listet i FIL" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1972,93 +1994,107 @@ msgstr "" "udelad indholdet i kataloger som indeholder CACHEDIR.TAG, undtagen " "mærkefilen CACHEDIR.TAG selv" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "udelad alt i kataloger som indeholder CACHEDIR.TAG" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "udelad kataloger som indeholder CACHEDIR.TAG" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "udelad indholdet i kataloger som indeholder FIL, undtagen FIL selv" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "udelad alting i kataloger som indeholder FIL" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "udelad kataloger som indeholder FIL" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "udelad kataloger fra versionshåndteringssystemer" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "udelad sikkerhedskopier og låsefiler" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "gå ikke ned i kataloger automatisk" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "skift ikke filsystem når arkivet oprettes" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "gå rekursivt ned i kataloger (standardværdi)" -#: src/tar.c:729 +#: src/tar.c:761 #, fuzzy msgid "don't strip leading '/'s from file names" msgstr "fjern ikke indledende '/' fra filnavne" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "følg symbolske lænker, arkivér filerne de peger på" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "følg hårde lænker, arkivér filerne de peger på" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "MEDLEMSNAVN" -#: src/tar.c:735 +#: src/tar.c:767 #, fuzzy msgid "begin at member MEMBER-NAME when reading the archive" msgstr "begynd med medlem MEDLEMSNAVN i arkivet" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "arkivér kun filer nyere end DATO-ELLER-FIL" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "DATO" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "sammenlign kun dato og tid for dataændringer" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "KONTROL" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "lav sikkerhedskopier før fjernelse, vælg type af versionshåndtering" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "STRENG" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -2066,102 +2102,102 @@ msgstr "" "lav sikkerhedskopier før fjernelse, erstat den normale sikkerhedskopiendelse " "(\"~\" hvis ikke ændret med miljøvariablen SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "Filnavnstransformationer:" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "fjern ANTAL indledende komponenter fra filnavne ved udpakning" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "UDTRYK" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "brug sed's erstatnings-UDTRYK for at transformere filnavne" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "Flag for match af filnavne (påvirker både ekskluderings- og " "inkluderingsmønstre):" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "ingen forskel på store og små bogstaver" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "mønstre skal matche med begyndelsen på filnavne" -#: src/tar.c:767 +#: src/tar.c:799 #, fuzzy msgid "patterns match after any '/' (default for exclusion)" msgstr "" "mønstre matches efter \"/\" i filnavne (standardværdi ved ekskludering)" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "match store og små bogstaver forskelligt (standardværdi)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "brug jokertegn (standardværdi for ekskludering)" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "ordret strengsammenligning" -#: src/tar.c:775 +#: src/tar.c:807 #, fuzzy msgid "wildcards do not match '/'" msgstr "jokertegn matcher ikke \"/\"" -#: src/tar.c:777 +#: src/tar.c:809 #, fuzzy msgid "wildcards match '/' (default for exclusion)" msgstr "jokertegn matcher \"/\" (standardværdi for ekskludering)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Informativ udskrift:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "vís navne på alle filer som bliver behandlet" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "NØGLEORD" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "advarselskontrol" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" "vis forløbsmeddelelser efter hver gruppe af ANTAL poster (standardværdi 10)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "HANDLING" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "udfør HANDLING ved hvert kontrolpunkt" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "vis en meddelelse hvis ikke alle lænker bliver arkiveret" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "SIGNAL" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2173,35 +2209,35 @@ msgstr "" "SIGHUP, SIGQUIT, SIGINT, SIGUSR1 coh SIGUSR2. Navne uden SIG-præfix " "accepteres også." -#: src/tar.c:802 +#: src/tar.c:834 msgid "print file modification times in UTC" msgstr "vis filers modificeringstid i UTC" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "vis fuld opløsning på filtider" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "send informative meddelelser til FIL" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "vis bloknummer i arkivet for hver meddelelse" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "bed om bekræftelse for hver handling" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "vis standardværdier for \"tar\"" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2209,31 +2245,31 @@ msgstr "" "ved visning eller udpakning vises hvert katalog som ikke matcher " "søgekriterium" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "vis fil- eller arkivnavne efter transformering" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "STÍL" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "sæt citatstíl for navne. Se nedenfor for gyldige værdier på STÍL." -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "citér også tegn i STRENG" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "citér ikke tegn fra STRENG" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "Kompatibilitetsflag:" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2241,15 +2277,15 @@ msgstr "" "ved oprettelse det samme som --old-archive; ved udpakning det samme som --no-" "same-owner" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "Andre flag:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "begræns brugen af potentielt farlige flag" -#: src/tar.c:978 +#: src/tar.c:1010 #, fuzzy msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " @@ -2257,40 +2293,40 @@ msgid "" msgstr "" "Du kan ikke angive mere end et af '-Acdtrux' eller `--test-label' flagene" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Konflikt i komprimeringsflag" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "Ukendt signalnavn: %s" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "Tidsfil blev ikke fundet" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Erstatter %s for ukendt dato-format %s" -#: src/tar.c:1108 +#: src/tar.c:1140 #, fuzzy, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "Flag %s: Behandler tidsangivelse \"%s\" som %s" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "filtrér arkivet igennem %s" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "Gyldige argumenter til flaget --quoting-style er:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2298,48 +2334,48 @@ msgstr "" "\n" "*Denne* tar har standardværdierne:\n" -#: src/tar.c:1295 +#: src/tar.c:1330 #, fuzzy msgid "Invalid owner or group ID" msgstr "Ugyldig ejer" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Ugyldig blokfaktor" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "Ugyldig båndlængde" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "Fejlagtig værdi for inkrementelt niveau" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "Mere end én grænse-dato" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "Ugyldig version for filer med huller" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve=\"system\" understøttes ikke på denne platform" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "--checkpoint-værdien er ikke et heltal" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Ugyldig modus angivet i flag" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "Ugyldigt nummer" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" @@ -2347,150 +2383,144 @@ msgstr "" "Flaget --preserve er forældet, brug --preserve-permissions --preserve-order " "i stedet" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Ugyldig poststørrelse" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "Poststørrelse skal være deleligt med %d." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "Ugyldigt antal elementer" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "Kun ét --to-command flag tilladt" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "Ugyldig densitetsangivelse: %s" -#: src/tar.c:2133 +#: src/tar.c:2205 #, fuzzy, c-format msgid "Unknown density: '%c'" msgstr "Ukendt densitet: '%c'" -#: src/tar.c:2150 +#: src/tar.c:2222 #, fuzzy, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "" "Flagene '-[0-7][lmh]' understøttes ikke af *denne* implementering af tar" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[FIL]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 +#, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "Mønster %s kan ikke bruges" + +#: src/tar.c:2389 #, fuzzy, c-format msgid "Old option '%c' requires an argument." msgstr "Gammelt flag '%c' behøver et argument." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence er meningsløs uden en filliste" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "--occurrence kan ikke bruges i den ønskede operationstilstand." - -#: src/tar.c:2408 +#: src/tar.c:2490 #, fuzzy msgid "Multiple archive files require '-M' option" msgstr "Ved flere arkivfiler kræves '-M'-flaget" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "Kan ikke kombinere --listed-incremental med --newer" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "--level er meningsløs uden --listed-incremental" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "%s: etiket på delarkiv er for lang (grænse er %lu byte)" msgstr[1] "%s: etiket på delarkiv er for lang (grænse er %lu byte)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Kan ikke verificere arkiv som går over flere delarkiver" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Kan ikke verificere komprimerede arkiver" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "Mønster %s kan ikke bruges" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Kan ikke bruge komprimerede arkiver som går over flere delarkiver" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "Kan ikke sammenlægge (konkatenere) komprimerede arkiver" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option kan kun bruges på POSIX-arkiver" -#: src/tar.c:2478 +#: src/tar.c:2560 #, fuzzy msgid "--acls can be used only on POSIX archives" msgstr "--pax-option kan kun bruges på POSIX-arkiver" -#: src/tar.c:2483 +#: src/tar.c:2565 #, fuzzy msgid "--selinux can be used only on POSIX archives" msgstr "--pax-option kan kun bruges på POSIX-arkiver" -#: src/tar.c:2488 +#: src/tar.c:2570 #, fuzzy msgid "--xattrs can be used only on POSIX archives" msgstr "--pax-option kan kun bruges på POSIX-arkiver" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "Mønster %s kan ikke bruges" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" +msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "Delarkivlængden kan ikke være mindre end poststørrelsen" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "--preserve-order er ikke kompatibel med --listed-incremental" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "Nægter stædigt at oprette et tomt arkiv" -#: src/tar.c:2565 +#: src/tar.c:2669 #, fuzzy msgid "Options '-Aru' are incompatible with '-f -'" msgstr "Flagene '-Aru' er inkompatible med '-f -'" -#: src/tar.c:2660 +#: src/tar.c:2766 #, fuzzy msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" msgstr "Du skal angive et af '-Acdtrux' eller '--test-label' flagene" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "Afslutter med fejlstatus på grund af tidligere fejl" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" @@ -2498,98 +2528,98 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: Filen formindskedes med %s byte" msgstr[1] "%s: Filen formindskedes med %s byte" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "Nøgleordet %s er ukendt eller ikke implementeret endnu" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" msgstr "Tidsstempel udenfor tilladt interval" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "Mønster %s kan ikke bruges" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Nøgleord %s kan ikke erstattes" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "Fejlagtigt udvidet hoved: længden mangles" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "Længde %*s på udvidet hoved er udenfor gyldigt interval" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "Fejlagtigt udvidet hoved: blanktegn efter længdangivelse mangles" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "Fejlagtigt udvidet hoved: ligmedtegn mangles" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "Fejlagtigt udvidet hoved: nylinje mangles" -#: src/xheader.c:740 +#: src/xheader.c:741 #, fuzzy, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "Ignorerer nøgleord \"%s\" i udvidet hoved" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "Genereret nøgle/værdi-par er for langt (nøgle=%s, længde=%s)" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "Udvidet hoved %s=%s er udenfor intervallet %s..%s" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Fejlagtigt udvidet hoved: ugyldig %s=%s" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Fejlagtigt udvidet hoved: for mange %s=%s" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "Fejlagtigt udvidet hoved: ugyldigt %s: uventet skilletegn %c" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "Fejlagtigt udvidet hoved: ugyldigt %s: ulige antal værdier" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "%s: ugyldig tidsudløb" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "%s: ukendt kontrolpunktshandling" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "skrive" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "læse" @@ -2597,7 +2627,7 @@ msgstr "l #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "Skrivekontrolpunkt %u" @@ -2606,7 +2636,7 @@ msgstr "Skrivekontrolpunkt %u" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "Læsekontrolpunkt %u" @@ -2864,12 +2894,19 @@ msgstr "Kommandoen afsluttedes\n" msgid "--stat requires file names" msgstr "--stat kræver filnavne" -#~ msgid "Cannot get working directory" -#~ msgstr "Kan ikke finde arbejdskatalog" - #~ msgid "sort names to extract to match archive" #~ msgstr "sortér navne som skal udpakkes så de passer med arkivet" +#, fuzzy +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "--occurrence kan ikke bruges i den ønskede operationstilstand." + +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "Kan ikke kombinere --listed-incremental med --newer" + +#~ msgid "--preserve-order is not compatible with --listed-incremental" +#~ msgstr "--preserve-order er ikke kompatibel med --listed-incremental" + #~ msgid "Field too long while reading snapshot file" #~ msgstr "Felt for langt da øjebliksfil læstes" @@ -2879,12 +2916,15 @@ msgstr "--stat kr #~ msgid "Unexpected field value in snapshot file" #~ msgstr "Uventet feltværdi i øjebliksfil" -#~ msgid "Extended header length is out of allowed range" -#~ msgstr "Længde på udvidet hoved er udenfor gyldigt interval" +#~ msgid "Cannot get working directory" +#~ msgstr "Kan ikke finde arbejdskatalog" #~ msgid "Invalid group" #~ msgstr "Ugyldig gruppe" +#~ msgid "Extended header length is out of allowed range" +#~ msgstr "Længde på udvidet hoved er udenfor gyldigt interval" + #~ msgid "%s: Directory removed before we read it" #~ msgstr "%s: Katalog fjernet før vi læste det" diff --git a/po/de.gmo b/po/de.gmo index d32c51a..af2ac4b 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index 412fa78..0d4e418 100644 --- a/po/de.po +++ b/po/de.po @@ -4,15 +4,15 @@ # Ulrich Drepper , 1995? # Karl Eichwalder , 1996 # Christian Kirsch , 1996, 2001 -# Michael Piefel , 2003, 2006, 2007, 2008, 2009, 2010, 2011 +# Michael Piefel , 2003, 2006, 2007, 2008, 2009, 2010, 2011, 2013 # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" -"Project-Id-Version: tar 1.26\n" +"Project-Id-Version: tar 1.27\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" -"PO-Revision-Date: 2011-03-14 21:35+0100\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" +"PO-Revision-Date: 2013-10-26 21:35+0200\n" "Last-Translator: Michael Piefel \n" "Language-Team: German \n" "Language: de\n" @@ -81,7 +81,7 @@ msgid " [OPTION...]" msgstr " [OPTION...]" #: gnu/argp-help.c:1686 -#, fuzzy, c-format +#, c-format msgid "Try '%s --help' or '%s --usage' for more information.\n" msgstr "„%s --help“ oder „%s --usage“ gibt weitere Informationen.\n" @@ -102,7 +102,7 @@ msgstr "diese Hilfe ausgeben" msgid "give a short usage message" msgstr "eine kurze Benutzungsübersicht ausgeben" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "NAME" @@ -141,9 +141,9 @@ msgid "write error" msgstr "Schreibfehler" #: gnu/getopt.c:549 gnu/getopt.c:578 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: Option „%s“ ist mehrdeutig\n" +msgstr "%s: Option „%s“ ist mehrdeutig; Möglichkeiten:" #: gnu/getopt.c:626 gnu/getopt.c:630 #, c-format @@ -435,7 +435,7 @@ msgstr "Allgemeine Hilfe zu GNU-Software: \n" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: Funktion %s fehlgeschlagen" @@ -444,56 +444,56 @@ msgstr "%s: Funktion %s fehlgeschlagen" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: Warnung: Funktion %s fehlgeschlagen" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: Kann Zugriffsrechte nicht zu %s ändern" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: Kann Datei-Eigentümer nicht zu uid %lu, gid %lu ändern" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: Kann keine harte Verknüpfung zu „%s“ anlegen" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Lesefehler bei Byte %s beim Lesen von einem Byte" msgstr[1] "%s: Lesefehler bei Byte %s beim Lesen von %lu Bytes" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Warnung: Lesefehler bei Byte %s beim Lesen von einem Byte" msgstr[1] "%s: Warnung: Lesefehler bei Byte %s beim Lesen von %lu Bytes" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: Kann nicht auf %s positionieren" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: Warnung: Kann nicht auf %s positionieren" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: Kann keine symbolische Verknüpfung zu „%s“ anlegen" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -539,9 +539,9 @@ msgid "Cannot connect to %s: resolve failed" msgstr "Kann nicht mit %s verbinden: Auflösung fehlgeschlagen" #: lib/rtapelib.c:502 -#, fuzzy, c-format +#, c-format msgid "Cannot redirect files for remote shell" -msgstr "Kann Remote-Shell nicht ausführen." +msgstr "Kann Dateien für Remote-Shell nicht umleiten." #: lib/rtapelib.c:516 #, c-format @@ -593,8 +593,8 @@ msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "" "Ein Bandlaufwerk bearbeiten, dabei Befehle von entferntem Prozess annehmen" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "ZAHL" @@ -602,10 +602,10 @@ msgstr "ZAHL" msgid "set debug level" msgstr "Debug-Level setzen" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "DATEI" @@ -627,103 +627,111 @@ msgstr "zu viele Argumente" msgid "Garbage command" msgstr "Ungültiger Befehl" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Das sieht nicht wie ein „tar“-Archiv aus." -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" -msgstr "Gesamtzahl geschriebener Bytes" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" msgstr "Gesamtzahl gelesener Bytes" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "Gesamtzahl geschriebener Bytes" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Gesamtzahl gelöschter Bytes: %s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(pipe)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "Ungültiger Wert für „record_size“." -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Kein Archivname angegeben" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Kann Archive auf Standard-Ein-/Ausgabe nicht prüfen." -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Archiv ist komprimiert. Benutzen Sie die Option %s." -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Kann komprimierte Archive nicht aktualisieren" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "Am Anfang des Mediums, beende jetzt." -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "Zu viele Fehler, beende." -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Recordgröße = %lu Block" msgstr[1] "Recordgröße = %lu Blöcke" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "Falsch ausgerichteter Block (ein Byte) im Archiv." msgstr[1] "Falsch ausgerichteter Block (%lu Bytes) im Archiv." -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "Kann Archiv-Datei nicht zurücksetzen; könnte ohne „-i“ unlesbar sein." -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "„rmtlseek“ nicht an Recordgrenze angehalten" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: enthält ungültige Teil-Nummer." -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "Teil-Nummer zu groß." -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Medium #%d für %s einlegen und Eingabetaste drücken: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "Dateiende gefunden, Benutzereingabe erwartet" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "WARNUNG: Archiv unvollständig" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -735,67 +743,67 @@ msgstr "" " q „tar“ abbrechen\n" " j oder Enter fortfahren\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Shell in einem Unterprozess starten\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? diese Liste ausgeben\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Kein neues Medium; halte an.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "Dateiname nicht angegeben. Versuchen Sie es noch einmal.\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Ungültige Eingabe. Geben Sie „?“ für Hilfe ein.\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "„%s“-Befehl gescheitert." -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" "%s wird möglicherweise auf diesem Teil fortgesetzt: Kopf enthält " "abgeschnittenen Namen." -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "Dieser Teil ist keine Fortsetzung von %s." -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s hat die falsche Größe (%s != %s + %s)." -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Dieser Teil ist nicht an der Reihe (%s - %s != %s)." -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "Kennzeichnung des Archivs passt nicht zu „%s“." -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "Teil „%s“ passt nicht zu „%s“." -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -803,7 +811,7 @@ msgstr "" "%s: Dateiname zu lang, um in einem GNU-Mehrteil-Kopf abgelegt werden zu " "können, abgeschnitten" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "Schreiben endete nicht an Blockgrenze" @@ -814,16 +822,16 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Konnte nur %lu von %lu Byte lesen" msgstr[1] "Konnte nur %lu von %lu Bytes lesen" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "Unterschiedliche Inhalte" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "Unerwartetes Dateiende im Archiv." -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "Unterschiedliche Dateitypen " @@ -843,7 +851,7 @@ msgstr "Gruppenkennung ist unterschiedlich" msgid "Mod time differs" msgstr "Änderungszeit ist unterschiedlich" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Größe ist unterschiedlich" @@ -860,36 +868,36 @@ msgstr "Symbolische Verknüpfung ist unterschiedlich" msgid "Device number differs" msgstr "Unterschiedliche Gerätenummern" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Prüfe " -#: src/compare.c:471 -#, fuzzy, c-format +#: src/compare.c:473 +#, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "%s: Unbekannter Dateityp „%c“, Differenz wie für eine normale Datei." -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "Archiv enthält Dateinamen, deren Präfixe entfernt wurden." -#: src/compare.c:533 +#: src/compare.c:535 msgid "Archive contains transformed file names." msgstr "Archiv enthält transformierte Dateinamen." -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "Die Ãœberprüfung findet möglicherweise die Originaldateien nicht." -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "FEHLER BEI PRÃœFUNG: %d ungültiger Kopfteil erkannt." msgstr[1] "FEHLER BEI PRÃœFUNG: %d ungültige Kopfteile erkannt." -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "Ein einzelner Nullblock bei %s" @@ -936,55 +944,55 @@ msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "Datei %s ist um ein Byte geschrumpft, fülle mit Null auf." msgstr[1] "Datei %s ist um %s Bytes geschrumpft, fülle mit Nullen auf." -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "Datei %s liegt auf einem anderen Dateisystem; nicht gesichert." -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "Inhalt nicht gesichert" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Unbekannter Dateityp; Datei ignoriert." -#: src/create.c:1549 +#: src/create.c:1551 #, c-format msgid "Missing links to %s." msgstr "Fehlende Verknüpfungen zu %s." -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "Datei %s ist unverändert; nicht gesichert." -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s ist das Archiv; nicht gesichert." -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "Verzeichnis nicht gesichert" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: Datei hat sich beim Lesen geändert." -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: Socket ignoriert" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: Klappe ignoriert" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Springe zum nächsten Kopfteil." @@ -1010,7 +1018,7 @@ msgstr "%s: Unerwarteter Inkonsitenz beim Erstellen des Verzeichnisses." #: src/extract.c:705 #, c-format msgid "%s: skipping existing file" -msgstr "" +msgstr "%s: überspringe existierende Datei" #: src/extract.c:821 #, c-format @@ -1032,12 +1040,12 @@ msgid "%s: Cannot extract -- file is continued from another volume" msgstr "" "Kann „%s“ nicht herausholen – Datei ist Fortsetzung eines anderen Teils." -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" msgstr "Unerwarteter Kopfteil mit langem Namen" #: src/extract.c:1542 -#, fuzzy, c-format +#, c-format msgid "%s: Unknown file type '%c', extracted as normal file" msgstr "%s: Unbekannter Dateityp „%c“, wie normale Datei extrahiert." @@ -1067,218 +1075,219 @@ msgid "%s: Directory is new" msgstr "Verzeichnis „%s“ ist neu." #: src/incremen.c:566 -#, fuzzy, c-format +#, c-format msgid "%s: directory is on a different filesystem; not dumped" -msgstr "Datei %s liegt auf einem anderen Dateisystem; nicht gesichert." +msgstr "Verzeichnis %s liegt auf einem anderen Dateisystem; nicht gesichert." #: src/incremen.c:587 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Verzeichnis wurde umbenannt." -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "Ungültiger Zeitstempel" -#: src/incremen.c:1045 -#, fuzzy +#: src/incremen.c:1047 msgid "Invalid modification time" -msgstr "Ungültige Änderungszeit (Sekunden)." +msgstr "Ungültige Änderungszeit" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "Ungültige Änderungszeit (Nanosekunden)." -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "Ungültige Gerätenummer" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Ungültige Inode-Nummer" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" -msgstr "" +msgstr "%s: Byte %s: %s %.*s... zu lang" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" msgstr "Unerwartetes Dateiende im Schnappschussdatei." -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" -msgstr "" +msgstr "%s: Byte %s: %s %s gefolgt von ungültigem Byte 0x%02x" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" +"%s: Byte %s: (gültiger Bereich %s..%s)\n" +"\t%s %s" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" -msgstr "" +msgstr "%s: Byte %s: %s %s" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" -msgstr "" +msgstr "%s: Byte %s: %s" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "Fehlender Record-Abschluss" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "unzulässiges inkrementelles Dateiformat" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "Nicht unterstützte Version des inkrementellen Formats: %" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Fehlgeformtes Verzeichnis für Dump: „%c“ erwartet, aber %#3o gefunden" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Fehlgeformtes Verzeichnis für Dump: „X“ dupliziert" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Fehlgeformtes Verzeichnis für Dump: leerer Name in „R“" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Fehlgeformtes Verzeichnis für Dump: „T“ folgt nicht „R“" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Fehlgeformtes Verzeichnis für Dump: leerer Name in „T“" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" "Fehlgeformtes Verzeichnis für Dump: „%c“ erwartet, aber Ende der Daten " "gefunden" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "Fehlgeformtes Verzeichnis für Dump: „X“ nie benutzt" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Kann kein temporäres Verzeichnis mit der Schablone %s anlegen" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Entferne Verzeichnis nicht: kann nicht zugreifen" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: Verzeichnis liegt auf einem anderen Dateisystem: entferne nicht." -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Lösche %s.\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: Kann nicht entfernen." -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: Ausgelassen" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "Block %s: ** Block aus NULlen **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "Block %s: ** Ende der Datei **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "Block %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Leerzeichen im Kopfteil, wo numerische %s-Werte stehen sollten." #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "Oktalzahl %.*s außerhalb des %s-Bereichs, nehme Zweierkomplement an?" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Oktalzahl %.*s außerhalb des %s-Bereichs" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "Archiv enthält veraltete Base64-Kopfteile" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Base64-Text %s außerhalb des %s-Bereichs." -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Base-256-Wert ist außerhalb des %s-Bereichs." #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Archiv enthält „%.*s“ wo numerische %s-Werte stehen sollten." #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Wert %s außerhalb des %s-Bereichs %s..%s." -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " Verknüpfung zu %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " unbekannter Dateityp %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "––Lange Verknüpfung––\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "––Langer Name––\n" @@ -1286,73 +1295,73 @@ msgstr "––Langer Name––\n" # Alte Ãœs: Band Kopfteil. Kann diese Meldung auch bei Disketten # ausgegeben werden? Dann kann man ja nicht "Band" sagen; am besten # einfach "Volume" lassen. ke. -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "––Vorspann des Teils––\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "––Fortgesetzt bei Byte %s––\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Erzeuge Verzeichnis:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "Benenne „%s“ in „%s“ um.\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Kann nicht in %s umbenennen" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "Benenne „%s“ zurück in „%s“.\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Datei gelöscht, bevor sie gelesen wurde." -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "Kindprozess" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "Interprocess-Kanal" #: src/names.c:360 -#, fuzzy msgid "command line" -msgstr "„%s“-Befehl gescheitert." +msgstr "Kommandozeile" #: src/names.c:378 -#, fuzzy, c-format +#, c-format msgid "%s: file list requested from %s already read from %s" -msgstr "%s: Dateiliste schon gelesen" +msgstr "" +"%s: Dateiliste, die von %s angefordert wurde, wurde schon von %s gelesen" -#: src/names.c:448 -#, fuzzy, c-format +#: src/names.c:448 src/checkpoint.c:274 +#, c-format msgid "cannot split string '%s': %s" -msgstr "kann an „%s“ keine Zeit setzen" +msgstr "kann Zeichenkette „%s“ nicht zerteilen: %s" #: src/names.c:490 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: gelesener Dateiname enthält ein NULL-Zeichen" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "Zeichen für Musterüberdeckung im Dateinamen benutzt" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1360,54 +1369,53 @@ msgstr "" "Benutzen Sie --wildcards, um Musterüberdeckung zu ermöglichen oder\n" "--no-wildcards, um diese Warnung zu unterdrücken." -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: Nicht im Archiv gefunden." -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Erforderliches Auftreten nicht im Archiv gefunden." -#: src/names.c:876 +#: src/names.c:879 #, c-format msgid "Archive label mismatch" msgstr "Kennzeichnung des Archivs passt nicht" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "Option -C in Dateiliste ist nicht erlaubt mit --listed-incremental" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "In --listed-incremental ist nur eine Option -C erlaubt" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "Die beiden Optionen „-%s“ und „-%s“ verlangen Standard-Eingabe." -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s: Ungültiges Archivformat" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "GNU-Erweiterungen bei einem inkompatiblen Archiv-Format verlangt." -#: src/tar.c:255 -#, fuzzy, c-format +#: src/tar.c:264 +#, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." msgstr "" "Unbekannter Zitatstil „%s“. Versuchen Sie „%s --quoting-style=help“ für eine " "Liste." -#: src/tar.c:364 -#, fuzzy +#: src/tar.c:378 msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1426,8 +1434,7 @@ msgstr "" " tar -tvf archiv.tar # Inhalt von archiv.tar ausführlich anzeigen\n" " tar -xf archiv.tar # alle Dateien aus archiv.tar extrahieren\n" -#: src/tar.c:373 -#, fuzzy +#: src/tar.c:387 msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" "The version control may be set with --backup or VERSION_CONTROL, values " @@ -1451,79 +1458,79 @@ msgstr "" " vorhanden sind, sonst einfache\n" " never, simple immer einfache Sicherheitskopien\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "Hauptsächlicher Arbeitsmodus:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "den Inhalt eines Archivs auflisten" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "Dateien aus einem Archiv extrahieren" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "ein neues Archiv anlegen" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "Unterschiede zwischen Archiv und Dateisystem suchen" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "Dateien hinten an das Archiv anfügen" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "nur Dateien anfügen, die neuer als die Kopie im Archiv sind" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "tar-Dateien an ein Archiv anfügen" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "aus dem Archiv löschen (nicht auf Magnetband!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "den Archiv-Teil-Namen überprüfen und beenden" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "Feineinstellungen:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "löchrige Dateien („sparse files“) effizient behandeln" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "MAJOR[.MINOR]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "zu benutzende Version des Sparse-Formats setzen (impliziert --sparse)" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "inkrementelle Sicherung im alten GNU-Format" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "inkrementelle Sicherung im neuen GNU-Format" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "Niveau für erzeugte Archive mit --listed-incremental ausgeben" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "kein Abbruch mit Existatus!=0 bei unlesbaren Dateien" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1535,136 +1542,147 @@ msgstr "" "list und wenn eine Dateiliste entweder auf der Kommandozeile oder mittels " "der Option -T angegeben wurde benutzt werden; Zahl ist standardmäßig 1" -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "im Archiv kann positioniert werden" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "im Archiv kann nicht positioniert werden" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "Gerätenummer bei Erstellung inkrementeller Archive nicht prüfen" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" "Gerätenummer bei Erstellung inkrementeller Archive prüfen (Voreinstellung)" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "Steuerung des Ãœberschreibens:" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "Archiv nach dem Schreiben prüfen" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "Dateien nach dem Hinzufügen zum Archiv löschen" -#: src/tar.c:471 -#, fuzzy +#: src/tar.c:485 msgid "don't replace existing files when extracting, treat them as errors" -msgstr "vorhandene Dateien beim Extrahieren nicht überschreiben" +msgstr "" +"vorhandene Dateien beim Extrahieren nicht überschreiben, sondern als Fehler " +"behandeln" -#: src/tar.c:474 -#, fuzzy +#: src/tar.c:488 msgid "don't replace existing files when extracting, silently skip over them" -msgstr "vorhandene Dateien beim Extrahieren nicht überschreiben" +msgstr "" +"vorhandene Dateien beim Extrahieren nicht überschreiben, kommentarlos " +"überspringen" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "" "vorhandene Dateien, die neuer als die Archivkopie sind, nicht überschreiben" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "vorhandene Dateien beim Extrahieren überschreiben" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "zu überschreibende Dateien vor dem Extrahieren löschen" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "" "Verzeichnishierarchien rekursiv vor dem Extrahieren eines Verzeichnisses " "löschen" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "Metadaten existierender Verzeichnisse erhalten" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "Metadaten existierender Verzeichnisse beim Extrahieren überschreiben " "(Voreinstellung)" -#: src/tar.c:490 -#, fuzzy +#: src/tar.c:504 msgid "preserve existing symlinks to directories when extracting" -msgstr "vorhandene Dateien beim Extrahieren überschreiben" +msgstr "" +"vorhandene symbolische Verknüpfungen auf Verzeichnisse beim Extrahieren " +"erhalten" + +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "VERZEICHNIS" -#: src/tar.c:496 +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "Wahl des Ausgabestroms:" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "Dateien auf die Standardausgabe extrahieren" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "BEFEHL" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "extrahierte Dateien an ein anderes Programm weiterreichen" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "Exitstatus der Kinder ignorieren" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "Exitstatus!=0 von Kindern als Fehler ansehen" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Behandlung der Datei-Attribute:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "Eigentümer für hinzugefügte Dateien auf NAME setzen" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "Gruppe für hinzugefügte Dateien auf NAME setzen" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "DATUM-ODER-DATEI" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "Änderungszeit für hinzugefügte Datei aus DATUM-ODER-DATEI beziehen" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "ÄNDERUNGEN" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "den (symbolischen) Modus ÄNDERUNGEN für hinzugefügte Dateien erzwingen" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "METHODE" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " @@ -1675,11 +1693,11 @@ msgstr "" "oder dadurch, dass die Zeiten gar nicht erst neu gesetzt werden (METHODE=" "„system“)" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "die geänderte Zeit nicht extrahieren" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" @@ -1687,23 +1705,23 @@ msgstr "" "versuchen, die Dateien mit denselben Eigentumsverhältnisse zu extrahieren " "(für den Admin ist dies die Voreinstellung)" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "" "Dateien als aktueller Nutzer extrahieren (für normale Nutzer die " "Voreinstellung)" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "immer Zahlen für Nutzer-/Gruppennamen verwenden" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" "Informationen über Dateizugriffsrechte mit extrahieren (Voreinstellung für " "Root)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1711,16 +1729,18 @@ msgstr "" "die Umask des Nutzers anwenden beim Extrahieren von Dateizugriffsrechte aus " "dem Archiv (Voreinstellung für normale Nutzer)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" +"Argumente für Elemente werden in der gleichen Anordnung wie die Dateien im " +"Archiv aufgeführt" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "wie -p und -s zusammen" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1728,180 +1748,187 @@ msgstr "" "das Setzen von Zugriffszeiten und Rechten von extrahierten Verzeichnissen " "verschieben bis zum Ende des Entpackens" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "den Effekt von --delay-directory-restore aufheben" -#: src/tar.c:554 -#, fuzzy +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 msgid "Handling of extended file attributes:" -msgstr "Behandlung der Datei-Attribute:" +msgstr "Behandlung der erweiterten Datei-Attribute:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" -msgstr "" +msgstr "Unterstützung für erweiterte Attribute ermöglichen" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" -msgstr "" +msgstr "Unterstützung für erweiterte Attribute abschalten" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" -msgstr "" +msgstr "MASKE" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" -msgstr "" +msgstr "das Einschluss-Muster für xattr-Schlüssel angeben" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" -msgstr "" +msgstr "das Ausschluss-Muster für xattr-Schlüssel angeben" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" -msgstr "" +msgstr "Unterstützung für SELinux-Kontext ermöglichen" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" -msgstr "" +msgstr "Unterstützung für SELinux-Kontext abschalten" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" -msgstr "" +msgstr "Unterstützung für POSIX-ACLs ermöglichen" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" -msgstr "" +msgstr "Unterstützung für POSIX-ACLs abschalten" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "Geräteauswahl und -umschaltung:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ARCHIV" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "Archivdatei oder Gerät ARCHIV benutzen" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "Archivdatei ist lokal, auch wenn der Name einen Doppelpunkt enthält" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "statt „rmt“ den gegebenen BEFEHL benutzen" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "statt „rsh“ den entfernten BEFEHL benutzen" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "Laufwerk und Schreibdichte angeben" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "mehrteiliges Archiv anlegen/listen/extrahieren" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "Medium wechseln, wenn ZAHL × 1024 Bytes geschrieben wurden" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "am Ende jedes Mediums das Skript ausführen (impliziert -M)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "Teil-Nummer in DATEI benutzen/aktualisieren" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "Blockung des Gerätes:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "BLÖCKE" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "BLÖCKE × 512 Bytes pro Record" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "ZAHL Bytes pro Record, Vielfaches von 512" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "Blöcke mit Nullen im Archiv ignorieren (heißt EOF)" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "erneut Blocken beim Lesen (für 4.2BSDâ€Pipes)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "Auswahl des Archiv-Formats:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "FORMAT" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "Archiv mit dem gegebenen Format anlegen" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "FORMAT ist eines der folgenden:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "altes V7-tar-Format" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "GNU-Format wie mit tar <=1.12" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "GNU-tar-1.13.x-Format" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "Format von POSIX 1003.1-1988 (ustar)" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "Format von POSIX 1003.1-2001 (pax)" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "wie pax" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "wie --format=v7" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "wie --format=posix" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "Schlüsselwort[[:]=Wert][,Schlüsselwort[[:]=Wert]]..." -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "Pax-Schlüsselwörter steuern" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "TEXT" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1909,78 +1936,76 @@ msgstr "" "Archiv mit dem Teilnamen TEXT anlegen; beim Listen/Extrahieren, TEXT als " "Muster für den Teilnamen benutzen" -#: src/tar.c:660 +#: src/tar.c:684 msgid "Compression options:" msgstr "Kompressionsoptionen:" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "Archiverweiterung nehmen, um Kompressionsprogramm zu bestimmen" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "Archiverweiterung nicht nehmen, um Kompressionsprogramm zu bestimmen" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "PROG" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "durch PROG filten (muss -d akzeptieren)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "Auswahl der lokalen Dateien:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" "angegebene Datei zum Archiv hinzufügen (nützlich, wenn Datei mit einem " "Strich beginnt)" -#: src/tar.c:687 -msgid "DIR" -msgstr "VERZEICHNIS" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "zu VERZEICHNIS wechseln" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "Namen der zu bearbeitenden Dateien aus DATEI lesen" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "-T liest null-terminierte Namen, verbiete -C" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "die Wirkung der vorangehenden Option --null aufheben" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" msgstr "" "Dateinamen, die mit -T gelesen werden, von Zitat befreien (Voreinstellung)" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" msgstr "Dateinamen, die mit -T gelesen werden, nicht von Zitat befreien" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "MUSTER" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "Dateien auslassen, auf die MUSTER passt" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "Dateien auslassen, auf die in DATEI angegebene Muster passen" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1988,99 +2013,111 @@ msgstr "" "Inhalt von Verzeichnissen auslassen, die CACHEDIR.TAG enthalten, außer der " "Markierungsdatei selbst" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" "alles unterhalb von Verzeichnissen auslassen, die CACHEDIR.TAG enthalten" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "Verzeichnisse auslassen, die CACHEDIR.TAG enthalten" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" "Inhalt von Verzeichnissen auslassen, die DATEI enthalten, außer DATEI selbst" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "alles unterhalb von Verzeichnissen auslassen, die DATEI enthalten" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "Verzeichnisse auslassen, die DATEI enthalten" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "Verzeichnisse von Versionskontrollsystemen auslassen" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "Backup- und Lock-Dateien ausschließen" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "automatischen Abstieg in Vezeichnisse vermeiden" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "beim Anlegen eines Archivs im lokalen Dateisystem bleiben" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "in Verzeichnisse absteigen (Voreinstellung)" -#: src/tar.c:729 -#, fuzzy +#: src/tar.c:761 msgid "don't strip leading '/'s from file names" msgstr "führende „/“-Zeichen in den Dateinamen erhalten" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "" "symbolischen Verknüpfungen folgen; die Dateien archivieren und abspeichern, " "auf die sie zeigen" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "" "harten Verknüpfungen folgen; die Dateien archivieren und abspeichern, auf " "die sie sich beziehen" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "ELEMENT-NAME" -#: src/tar.c:735 -#, fuzzy +#: src/tar.c:767 msgid "begin at member MEMBER-NAME when reading the archive" -msgstr "mit ELEMENT-NAME im Archiv beginnen" +msgstr "beim Lesen der Archivs mit ELEMENT-NAME beginnen" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "nur Dateien ablegen, die neuer als DATUM-ODER-DATEI sind" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "DATUM" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "Datum und Zeit nur überprüfen, wenn Daten geändert wurden" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "KONTROLLE" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "Sicherung vor dem Entfernen, wähle Versions-KONTROLLE" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "ZEICHENKETTE" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -2088,101 +2125,98 @@ msgstr "" "Sicherung vor dem Entfernen, übliches Suffix ersetzen („~“, wenn nicht durch " "Umgebungsvariable SIMPLE_BACKUP_SUFFIX anders gesetzt)" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "Dateinamentransformationen:" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "ZAHL führende Komponenten beim Extrahieren von Dateinamen entfernen" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "AUSDRUCK" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "den sed-AUSDRUCK zur Dateinamentransformation benutzen" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "Dateinamenauswahloptionen (sowohl für ein- als auch ausschließende Muster):" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "Groß-/Kleinschreibung ignorieren" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "Muster am Dateinamensanfang ausrichten" -#: src/tar.c:767 -#, fuzzy +#: src/tar.c:799 msgid "patterns match after any '/' (default for exclusion)" msgstr "Muster passen nach jedem „/“ (Voreinstellung beim Ausschluss)" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "Groß-/Kleinschreibung beachten (Voreinstellung)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "Muster benutzen (Voreinstellung für Ausschluss)" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "Zeichenketten sind buchstabengetreu" -#: src/tar.c:775 -#, fuzzy +#: src/tar.c:807 msgid "wildcards do not match '/'" msgstr "Jokerzeichen passen nicht auf „/“" -#: src/tar.c:777 -#, fuzzy +#: src/tar.c:809 msgid "wildcards match '/' (default for exclusion)" msgstr "Jokerzeichen passen auf „/“ (Voreinstellung für Ausschluss)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Informationen:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "bearbeitete Dateien ausführlich listen" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "SCHLÃœSSELWORT" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "Warnungssteuerung" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" "Fortschrittsnachrichten bei jedem ZAHLten Record (Voreinstellung 10) anzeigen" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "AKTION" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "AKTION bei jedem Kontrollpunkt ausführen" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "" "eine Nachricht ausgeben, wenn nicht alle Verknüpfungen abgespeichert werden" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "SIGNAL" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2194,35 +2228,35 @@ msgstr "" "wird; erlaubte Signale sind: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 und SIGUSR2; " "die Namen ohne das Präfix SIG sind auch erlaubt" -#: src/tar.c:802 +#: src/tar.c:834 msgid "print file modification times in UTC" msgstr "Dateiänderungszeiten in UTC anzeigen" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "Dateizeit in voller Auflösung anzeigen" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "ausführliche Ausgabe in DATEI schreiben" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "bei jeder Nachricht die Blocknummer innerhalb des Archivs mit anzeigen" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "für jede Aktion um Bestätigung bitten" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "Voreinstellungen von tar anzeigen" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" -msgstr "" +msgstr "gültige Bereiche für die Felder von Snapshot-Dateien anzeigen" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2230,86 +2264,86 @@ msgstr "" "beim Listen oder Extrahieren jedes Verzeichnis auflisten, dass nicht den " "Suchkriterien entspricht" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "Datei- oder Archivnamen nach der Transformation anzeigen" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "STIL" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "Zitatstil setzen; siehe unten für gültige STIL-Werte" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "zusätzliche Zeichen aus ZEICHENKETTE zitieren" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "Zeichen aus ZEICHENKETTE nicht zitieren" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "Kompatibilitätsoptionen:" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "beim Anlegen wie --old-archive; beim Extrahieren wie --no-same-owner" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "Weitere Optionen:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "möglicherweise schädliche Optionen deaktivieren" -#: src/tar.c:978 -#, fuzzy +#: src/tar.c:1010 msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" msgstr "" -"Von den Optionen „-Acdtrux“ oder „--test-label“ ist jeweils nur eine erlaubt" +"Von den Optionen „-Acdtrux“, „--delete“ oder „--test-label“ ist jeweils nur " +"eine erlaubt" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Kompressionsoptionen schließen sich gegenseitig aus." -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "Unbekannter Signalname: %s" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "Datumsdatei nicht gefunden" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Ersetze %s für unbekanntes Datumsformat %s" -#: src/tar.c:1108 -#, fuzzy, c-format +#: src/tar.c:1140 +#, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "Option %s: Behandle Datum „%s“ als %s" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "Archiv durch %s filtern" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "Gültige Argumente für die Option --quoting-style sind:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2317,48 +2351,47 @@ msgstr "" "\n" "*Dieses* „tar“ hat als Voreinstellung:\n" -#: src/tar.c:1295 -#, fuzzy +#: src/tar.c:1330 msgid "Invalid owner or group ID" -msgstr "Ungültiger Benutzer" +msgstr "Ungültige Benutzer- oder Gruppen-ID" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Ungültige Blockgröße" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "Ungültige Bandlänge" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "unzulässiger Wert für inkrementelles Niveau" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "Mehr als ein Datum angegeben." -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "Ungültiger Wert für Sparse-Version (für löchrige Dateien)" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' wird auf dieser Plattform nicht unterstützt" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "Wert für --checkpoint ist keine ganze Zahl" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Ungültige Zugriffsrechte angegeben." -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "Ungültige Zahl" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" @@ -2366,150 +2399,138 @@ msgstr "" "Die Option --preserve ist veraltet, benutzen Sie stattdessen --preserve-" "permissions --preserve-order" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Ungültiger Wert für Recordgröße." -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "Die Recordgröße muss ein Vielfaches von %d sein." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "Ungültige Elementanzahl" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "Nur eine Option --to-command erlaubt" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "Fehlgeformtes Dichteargument: %s" -#: src/tar.c:2133 -#, fuzzy, c-format +#: src/tar.c:2205 +#, c-format msgid "Unknown density: '%c'" -msgstr "Unbekannte Dicht: „%c“" +msgstr "Unbekannte Dichte: „%c“" -#: src/tar.c:2150 -#, fuzzy, c-format +#: src/tar.c:2222 +#, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "Die Optionen „-[0-7][lmh]“ unterstützt *dieses* „tar“ nicht." -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[DATEI]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 #, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "Option --%s kann nicht mit %s benutzt werden" + +#: src/tar.c:2389 +#, c-format msgid "Old option '%c' requires an argument." msgstr "Die alte Option „%c“ benötigt einen Parameter." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence ist ohne Dateiliste bedeutungslos" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "" -"--occurrence kann im angeforderten Operationsmodus nicht benutzt werden" - -#: src/tar.c:2408 -#, fuzzy +#: src/tar.c:2490 msgid "Multiple archive files require '-M' option" msgstr "Mehrere Archivdateien verlangen die Option „-M“." -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "--listed-incremental kann nicht mit --newer benutzt werden" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "--level ist ohne --listed-incremental bedeutungslos" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "%s: Band-Nummer ist zu lang (Maximum ist ein Byte)." msgstr[1] "%s: Band-Nummer ist zu lang (Maximum ist %lu Bytes)." -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Kann mehrteilige Archive nicht prüfen." -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Kann komprimierte Archive nicht prüfen" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "Muster %s kann nicht benutzt werden" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Kann keine mehrteiligen komprimierten Archive verwenden." -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "Kann komprimierte Archive nicht aneinanderhängen" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option kann nur mit POSIX-Archiven benutzt werden" -#: src/tar.c:2478 -#, fuzzy +#: src/tar.c:2560 msgid "--acls can be used only on POSIX archives" -msgstr "--pax-option kann nur mit POSIX-Archiven benutzt werden" +msgstr "--acls kann nur mit POSIX-Archiven benutzt werden" -#: src/tar.c:2483 -#, fuzzy +#: src/tar.c:2565 msgid "--selinux can be used only on POSIX archives" -msgstr "--pax-option kann nur mit POSIX-Archiven benutzt werden" +msgstr "--selinux kann nur mit POSIX-Archiven benutzt werden" -#: src/tar.c:2488 -#, fuzzy +#: src/tar.c:2570 msgid "--xattrs can be used only on POSIX archives" -msgstr "--pax-option kann nur mit POSIX-Archiven benutzt werden" +msgstr "--xattrs kann nur mit POSIX-Archiven benutzt werden" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "Muster %s kann nicht benutzt werden" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" +msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "Teillänge kann nicht unter der Recordgröße liegen" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "--preserve-order ist nicht kompatibel mit --listed-incremental" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "Anlegen eines leeren Archivs wird feige verweigert." -#: src/tar.c:2565 -#, fuzzy +#: src/tar.c:2669 msgid "Options '-Aru' are incompatible with '-f -'" msgstr "Die Optionen „-Aru“ sind nicht kompatibel mit „-f -“." -#: src/tar.c:2660 -#, fuzzy +#: src/tar.c:2766 msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" -msgstr "Eine der Optionen „-Acdtrux“ oder „--test-label“ ist notwendig." +msgstr "" +"Eine der Optionen „-Acdtrux“, „--delete“ oder „--test-label“ ist notwendig." -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "Beende mit Fehlerstatus aufgrund vorheriger Fehler" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" @@ -2517,52 +2538,52 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: Datei ist um ein Byte geschrumpft." msgstr[1] "%s: Datei ist um %s Bytes geschrumpft." -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "Schlüsselwort %s ist unbekannt oder noch nicht implementiert" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" msgstr "Zeitstempel außerhalb des zulässigen Bereichs" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "Muster %s kann nicht benutzt werden" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Schlüsselwort %s kann nicht überschrieben werden" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "Fehlgeformter erweiterter Kopfteil: fehlende Länge" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "Länge %*s des erweiterten Kopfteils ist außerhalb des Bereichs" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "Fehlgeformter erweiterter Kopfteil: fehlender Leerraum nach der Länge" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "Fehlgeformter erweiterter Kopfteil: fehlendes Gleichheitszeichen" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "Fehlgeformter erweiterter Kopfteil: fehlender Zeilenvorschub" -#: src/xheader.c:740 -#, fuzzy, c-format +#: src/xheader.c:741 +#, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "Ignoriere unbekanntes Schlüsselwort „%s“ für erweiterten Kopfteil" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" @@ -2570,50 +2591,50 @@ msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "Erweiterter Kopfteil %s=%s ist außerhalb des Bereichs %s..%s." -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Fehlgeformter erweiterter Kopfteil: ungültiges %s=%s" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Fehlgeformter erweiterter Kopfteil: überzähliges %s=%s" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" "Fehlgeformter erweiterter Kopfteil: ungültiges %s: unerwarteter Trenner %c" # Ist „odd“ hier ungerade oder merkwürdig? -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" "Fehlgeformter erweiterter Kopfteil: ungültiges %s: ungewöhnliche Anzahl von " "Werten" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "%s: kein gültiger Zeitüberschreitungswert" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "%s: unbekannte Kontrollpunkt-Aktion" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "lesen" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "schreiben" @@ -2621,7 +2642,7 @@ msgstr "schreiben" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "Schreib-Kontrollpunkt %u" @@ -2630,7 +2651,7 @@ msgstr "Schreib-Kontrollpunkt %u" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "Lese-Kontrollpunkt %u" @@ -2847,14 +2868,14 @@ msgid "cannot set time on `%s'" msgstr "kann an „%s“ keine Zeit setzen" #: tests/genfile.c:692 -#, fuzzy, c-format +#, c-format msgid "cannot truncate `%s'" -msgstr "kann „%s“ nicht entfernen (unlink)" +msgstr "kann „%s“ nicht abschneiden" #: tests/genfile.c:701 -#, fuzzy, c-format +#, c-format msgid "command failed: %s" -msgstr "„%s“-Befehl gescheitert." +msgstr "Befehl fehlgeschlagen: %s" #: tests/genfile.c:706 #, c-format @@ -2896,11 +2917,17 @@ msgstr "Befehl beendet\n" msgid "--stat requires file names" msgstr "--stat erfordert Dateinamen" -#~ msgid "Cannot get working directory" -#~ msgstr "Kann Arbeitsverzeichnis nicht ermitteln." +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "--occurrence kann mit %s nicht benutzt werden" -#~ msgid "sort names to extract to match archive" -#~ msgstr "zu entpackende Dateinamen wie im Archiv sortieren" +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "--listed-incremental kann nicht mit --newer benutzt werden" + +#~ msgid "--verify cannot be used with %s" +#~ msgstr "--verify kann nicht mit %s benutzt werden" + +#~ msgid "--preserve-order is not compatible with --listed-incremental" +#~ msgstr "--preserve-order ist nicht kompatibel mit --listed-incremental" #~ msgid "Field too long while reading snapshot file" #~ msgstr "Feld zu lang beim Lesen der Schnappschussdatei" @@ -2911,13 +2938,19 @@ msgstr "--stat erfordert Dateinamen" #~ msgid "Unexpected field value in snapshot file" #~ msgstr "Unerwarteter Feldwert in Schnappschussdatei" -#~ msgid "Extended header length is out of allowed range" -#~ msgstr "" -#~ "Länge des erweiterten Kopfteils ist außerhalb des erlaubten Bereichs" +#~ msgid "Cannot get working directory" +#~ msgstr "Kann Arbeitsverzeichnis nicht ermitteln." + +#~ msgid "sort names to extract to match archive" +#~ msgstr "zu entpackende Dateinamen wie im Archiv sortieren" #~ msgid "Invalid group" #~ msgstr "Ungültige Gruppe" +#~ msgid "Extended header length is out of allowed range" +#~ msgstr "" +#~ "Länge des erweiterten Kopfteils ist außerhalb des erlaubten Bereichs" + #~ msgid "%s: Directory removed before we read it" #~ msgstr "%s: Verzeichnis gelöscht, bevor es gelesen wurde." diff --git a/po/el.gmo b/po/el.gmo index 1f4e0e1..d930f6c 100644 Binary files a/po/el.gmo and b/po/el.gmo differ diff --git a/po/el.po b/po/el.po index 8801d26..fac010e 100644 --- a/po/el.po +++ b/po/el.po @@ -3,12 +3,12 @@ # Μπαλάσκας Ευάγγελος (Balaskas Euaggelos) , 2004. # Simos Xenitellis , 2004. # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" "Project-Id-Version: tar 1.13.25 \n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" "PO-Revision-Date: 2004-03-08 14:44+0200\n" "Last-Translator: Μπαλάσκας Ευάγγελος (Balaskas Euaggelos) \n" @@ -103,7 +103,7 @@ msgstr "" msgid "give a short usage message" msgstr "" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "" @@ -399,9 +399,7 @@ msgstr "" #: gnu/version-etc.c:249 #, fuzzy, c-format msgid "Report %s bugs to: %s\n" -msgstr "" -"\n" -"ΑναφοÏά σφαλμάτων στο .\n" +msgstr "Μετονομασία %s πίσω στο %s\n" #: gnu/version-etc.c:253 #, c-format @@ -421,7 +419,7 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: Δεν είναι δυνατή %s" @@ -430,34 +428,34 @@ msgstr "%s: Δεν είναι δυνατή %s" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: ΠÏοειδοποίηση: Δεν είναι δυνατή %s" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: Δεν είναι δυνατή η αλλαγή κατάστασης σε %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: Δεν είναι δυνατή η αλλαγή ιδιοκτησίας σε uid %lu, gid %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: Δεν είναι δυνατή η σÏνδεση Ï…Î»Î¹ÎºÎ¿Ï ÏƒÎµ %s" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, fuzzy, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Σφάλμα ανάγνωσης στο byte %s, διαβάζοντας %lu byte" msgstr[1] "%s: Σφάλμα ανάγνωσης στο byte %s, διαβάζοντας %lu byte" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, fuzzy, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" @@ -466,22 +464,22 @@ msgstr[0] "" msgstr[1] "" "%s: ΠÏοειδοποίηση: Σφάλμα ανάγνωσης στο byte %s, διαβάζοντας %lu byte" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: Δεν είναι δυνατή η αναζήτηση σε %s" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: ΠÏοειδοποίηση: Δεν είναι δυνατή η αναζήτηση σε %s" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: Δεν είναι δυνατή η δημιουÏγία ÏƒÏ…Î¼Î²Î¿Î»Î¹ÎºÎ¿Ï Î´ÎµÏƒÎ¼Î¿Ï ÏƒÏ„Î¿ %s" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, fuzzy, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -582,14 +580,21 @@ msgstr "" #: rmt/rmt.c:664 #, fuzzy msgid "Unexpected arguments" -msgstr "Μη αναμενόμενο EOF (Τέλος ΑÏχείου) στην αÏχειοθήκη" +msgstr "Μη αναμενόμενο EOF (Τέλος ΑÏχείου) στα κατακεÏματισμένα ονόματα" #: rmt/rmt.c:689 +#, fuzzy msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "" +"ΧÏήση: %s [ΕΠΙΛΟΓΉ]\n" +"ΔιαχείÏιση συσκευής αποθήκευσης ταινίας, αποδοχή εντολών από απομακÏυσμένη " +"διεÏγασία.\n" +"\n" +" --version Εμφάνιση πληÏοφοÏιών έκδοσης.\n" +" --help Εμφάνιση αυτής της βοήθειας.\n" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "" @@ -597,10 +602,10 @@ msgstr "" msgid "set debug level" msgstr "" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "" @@ -611,7 +616,7 @@ msgstr "" #: rmt/rmt.c:715 rmt/rmt.c:783 #, fuzzy, c-format msgid "cannot open %s" -msgstr "%s: Δεν είναι δυνατή η αναζήτηση σε %s" +msgstr "Δεν είναι δυνατό το κλείσιμο" #: rmt/rmt.c:780 tests/genfile.c:892 tests/genfile.c:909 #, c-format @@ -622,105 +627,113 @@ msgstr "" msgid "Garbage command" msgstr "Εντολή αποÏÏιμμάτων" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Αυτό δεν φαίνεται ως αÏχειοθήκη tar" -#: src/buffer.c:521 src/buffer.c:530 +#: src/buffer.c:574 +msgid "Total bytes read" +msgstr "" + +#: src/buffer.c:576 #, fuzzy msgid "Total bytes written" msgstr "Συνολικά byte που γÏάφτηκαν: %s (%sB, %sB/s)\n" -#: src/buffer.c:528 src/buffer.c:542 -msgid "Total bytes read" -msgstr "" - -#: src/buffer.c:532 -#, fuzzy, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Συνολικά byte που γÏάφτηκαν: %s (%sB, %sB/s)\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(σωλήνωση)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "ΆκυÏη τιμή για record_size" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Δεν δόθηκε όνομα αÏχειοθήκης" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "" "Δεν είναι δυνατή η επαλήθευση των κανονικών εισόδων/εξόδων της αÏχειοθήκης" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Δεν είναι δυνατή η ανανέωση των συμπιεσμένων αÏχειοθηκών" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "Στην αÏχή της ταινίας, τεÏματισμός Ï„ÏŽÏα" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "ΠάÏα πολλά σφάλματα, τεÏματισμός" -#: src/buffer.c:893 +#: src/buffer.c:944 #, fuzzy, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Μέγεθος εγγÏαφής = %lu block" msgstr[1] "Μέγεθος εγγÏαφής = %lu block" -#: src/buffer.c:914 +#: src/buffer.c:965 #, fuzzy, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "Μη ευθυγÏαμμισμένο μπλοκ (%lu byte) στην αÏχειοθήκη" msgstr[1] "Μη ευθυγÏαμμισμένο μπλοκ (%lu byte) στην αÏχειοθήκη" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: πεÏιέχει άκυÏο αÏιθμό τόμου" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "ΥπεÏχήλιση αÏÎ¹Î¸Î¼Î¿Ï Ï„ÏŒÎ¼Î¿Ï…" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "ΠÏοετοίμασε τον τόμο #%d για %s και πάτα το πλήκτÏο επιστÏοφής γÏαμμής" -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "EOF (Τέλος ΑÏχείου) ενώ η απάντηση του χÏήστη αναμενότανε" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "ΠΡΟΕΙΔΟΠΟΊΗΣΗ: Η αÏχειοθήκη είναι ημιτελής" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -732,71 +745,71 @@ msgstr "" " ! ΠαÏαγωγή νέου υπό-φλοιοÏ\n" " ? ΕκτÏπωση αυτής της λίστας\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Κανένας νέος τόμος; έξοδος\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, fuzzy, c-format msgid "%s command failed" msgstr "`%s' η εντολή απέτυχε" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, fuzzy, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s δεν συνεχίζεται σε αυτόν τον τόμο" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s δεν συνεχίζεται σε αυτόν τον τόμο" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s είναι το εσφαλμένο μέγεθος (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Αυτός ο τόμος είναι εκτός συνέχειας" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "Η αÏχειοθήκη δεν έχει ετικέτα για ταίÏιασμα %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "Ο τόμος %s δεν ταιÏιάζει %s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "" @@ -807,16 +820,16 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Δυνατή μόνο η ανάγνωση %lu από %lu byte" msgstr[1] "Δυνατή μόνο η ανάγνωση %lu από %lu byte" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "Τα πεÏιεχόμενα διαφέÏουν" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "Μη αναμενόμενο EOF (Τέλος ΑÏχείου) στην αÏχειοθήκη" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "Οι Ï„Ïποι αÏχείων διαφέÏουν" @@ -836,7 +849,7 @@ msgstr "Ταυτότητες ομάδας διαφέÏουν" msgid "Mod time differs" msgstr "ÎÏες Ï„Ïοποποίησης διαφέÏουν" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Τα μεγέθη διαφέÏουν" @@ -853,37 +866,37 @@ msgstr "Οι σÏνδεσμοι διαφέÏουν" msgid "Device number differs" msgstr "Οι αÏιθμοί των συσκευών διαφέÏουν" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Επαλήθευση " -#: src/compare.c:471 -#, fuzzy, c-format +#: src/compare.c:473 +#, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "%s: Άγνωστος Ï„Ïπος αÏχείου '%c', εκτέλεση της diff ως κανονικό αÏχείο" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "" -#: src/compare.c:533 +#: src/compare.c:535 #, fuzzy msgid "Archive contains transformed file names." msgstr "Η αÏχειοθήκη πεÏιέχει απαÏχαιωμένες επικεφαλίδες κωδικοποίησης base64" -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "" -#: src/compare.c:612 +#: src/compare.c:614 #, fuzzy, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "Η ΕΠΑΛΎΘΕΥΣΗ ΑΠΈΤΥΧΕ: ανιχνεÏτηκαν %d άκυÏη(ες) επικεφαλίδα(δες)" msgstr[1] "Η ΕΠΑΛΎΘΕΥΣΗ ΑΠΈΤΥΧΕ: ανιχνεÏτηκαν %d άκυÏη(ες) επικεφαλίδα(δες)" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "" @@ -929,55 +942,55 @@ msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "%s: Το αÏχείο συÏÏικνώθηκε σε %s bytes; συμπλήÏωση με μηδενικά" msgstr[1] "%s: Το αÏχείο συÏÏικνώθηκε σε %s bytes; συμπλήÏωση με μηδενικά" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: το αÏχείο είναι σε διαφοÏετικό σÏστημα αÏχείων; δεν αποθηκεÏτηκε" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Άγνωστος Ï„Ïπος αÏχείου; το αÏχείο αγνοήθηκε" -#: src/create.c:1549 +#: src/create.c:1551 #, fuzzy, c-format msgid "Missing links to %s." msgstr " σÏνδεσμος σε %s\n" -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: δεν μποÏεί να Ï„Ïοποποιηθεί το αÏχείο; δεν αποθηκεÏτηκε" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: το αÏχείο είναι η αÏχειοθήκη; δεν αποθηκεÏτηκε" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: αÏχείο Ï„Ïοποποιήθηκε κατά την ανάγνωση" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: η υποδοχή αγνοήθηκε" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: η πόÏτα αγνοήθηκε" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "ΠαÏαλείποντας στην επόμενη επικεφαλίδα" @@ -1023,13 +1036,13 @@ msgstr "ΠÏοσπάθεια εξαγωγής των συμβολικών συν msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Δεν είναι δυνατή η εξαγωγή -- το αÏχείο συνεχίζεται σε άλλο τόμο" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 #, fuzzy msgid "Unexpected long name header" msgstr "Μη αναμενόμενο EOF (Τέλος ΑÏχείου) στα κατακεÏματισμένα ονόματα" #: src/extract.c:1542 -#, fuzzy, c-format +#, c-format msgid "%s: Unknown file type '%c', extracted as normal file" msgstr "%s: Άγνωστος Ï„Ïπος αÏχείου '%c', εξαγωγή ως κανονικό αÏχείο" @@ -1068,156 +1081,156 @@ msgstr "%s: το αÏχείο είναι σε διαφοÏετικό σÏστη msgid "%s: Directory has been renamed" msgstr "%s: Ο κατάλογος έχει μετονομαστεί" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "ΆκυÏη ένδειξη χÏόνου" -#: src/incremen.c:1045 +#: src/incremen.c:1047 #, fuzzy msgid "Invalid modification time" msgstr "ΆκυÏη κατάσταση δόθηκε σε επιλογή" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "ΆκυÏος αÏιθμός συσκευής" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "ΆκυÏος αÏιθμός i-κόμβου" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" msgstr "" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Μη αναμενόμενο EOF (Τέλος ΑÏχείου) στην αÏχειοθήκη" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" msgstr "" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" msgstr "" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Δεν είναι δυνατή η δέσμευση μνήμης για τον συντελεστή ομαδοποίησης %d" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, fuzzy, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: το αÏχείο είναι σε διαφοÏετικό σÏστημα αÏχείων; δεν αποθηκεÏτηκε" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: ΔιαγÏαφή %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: Δεν είναι δυνατή η απομάκÏυνση" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: ΠαÏάλειψη" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "μπλοκ %s: ** Μπλοκ με χαÏακτήÏες NUL **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "μπλοκ %s: ** Τέλος ΑÏχείου **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "μπλοκ %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Κενά στην επικεφαλίδα ενώ αναμενόταν αÏιθμητική τιμή %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1225,98 +1238,98 @@ msgstr "" "συμπληÏώματα" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "ΑÏχειοθήκη οκταδικής τιμής %.*s είναι εκτός του %s εÏÏους" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "Η αÏχειοθήκη πεÏιέχει απαÏχαιωμένες επικεφαλίδες κωδικοποίησης base64" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" "Η αÏχειοθήκη είναι υπογεγÏαμμένη με αλφαÏιθμητικά base-64 %s είναι εκτός του " "%s εÏÏους" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Η αÏχειοθήκη με base-256 τιμές είναι εκτός του %s εÏÏους" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Η αÏχειοθήκη πεÏιέχει %.*s όπου αÏιθμητικές %s τιμές αναμένονται" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Η τιμή της αÏχειοθήκης %s είναι εκτός του %s εÏÏους %s..%s" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " σÏνδεσμος σε %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " άγνωστος Ï„Ïπος αÏχείου %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Επικεφαλίδα Τόμου--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Συνέχιση στο byte %s--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "ΔημιουÏγία καταλόγου:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "Μετονομασία %s σε %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Δεν είναι δυνατή η μετονομασία σε %s" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "Μετονομασία %s πίσω στο %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Το αÏχείο απομακÏÏνθηκε Ï€Ïιν το διαβάσουμε" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "θυγατÏική διεÏγασία" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "κανάλι Î¼ÎµÏ„Î±Î¾Ï Î´Î¹ÎµÏγασιών" @@ -1326,75 +1339,75 @@ msgid "command line" msgstr "`%s' η εντολή απέτυχε" #: src/names.c:378 -#, fuzzy, c-format +#, c-format msgid "%s: file list requested from %s already read from %s" -msgstr "%s: το αÏχείο είναι η αÏχειοθήκη; δεν αποθηκεÏτηκε" +msgstr "" -#: src/names.c:448 -#, fuzzy, c-format +#: src/names.c:448 src/checkpoint.c:274 +#, c-format msgid "cannot split string '%s': %s" -msgstr "%s: Δεν είναι δυνατή η αναζήτηση σε %s" +msgstr "" #: src/names.c:490 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: Δεν βÏέθηκε στην αÏχειοθήκη" -#: src/names.c:842 +#: src/names.c:845 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Δεν βÏέθηκε στην αÏχειοθήκη" -#: src/names.c:876 +#: src/names.c:879 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "Η αÏχειοθήκη δεν έχει ετικέτα για ταίÏιασμα %s" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "Οι επιλογές `-%s' και `-%s' απαιτοÏν κανονική είσοδο" -#: src/tar.c:163 +#: src/tar.c:164 #, fuzzy, c-format msgid "%s: Invalid archive format" msgstr "%s: ΆκυÏη ομάδα" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "Τα χαÏακτηÏιστικά GNU απαιτοÏν μη συμβατή διαμόÏφωση αÏχειοθήκης" -#: src/tar.c:255 +#: src/tar.c:264 #, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." msgstr "" -#: src/tar.c:364 +#: src/tar.c:378 #, fuzzy msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " @@ -1415,7 +1428,7 @@ msgstr "" "archive.tar με λεπτομέÏειες.\n" " %s -xf archive.tar # Εξάγει όλα τα αÏχεία από το archive.tar.\n" -#: src/tar.c:373 +#: src/tar.c:387 #, fuzzy msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1438,80 +1451,80 @@ msgstr "" "διαφοÏετικά\n" " never, simple πάντα κάνε απλά αντίγÏαφα\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "" -#: src/tar.c:411 +#: src/tar.c:425 #, fuzzy msgid "create a new archive" msgstr "Μη αναμενόμενο EOF (Τέλος ΑÏχείου) στην αÏχειοθήκη" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1519,614 +1532,640 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "" -#: src/tar.c:471 +#: src/tar.c:485 msgid "don't replace existing files when extracting, treat them as errors" msgstr "" -#: src/tar.c:474 +#: src/tar.c:488 msgid "don't replace existing files when extracting, silently skip over them" msgstr "" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:490 +#: src/tar.c:504 msgid "preserve existing symlinks to directories when extracting" msgstr "" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "" -#: src/tar.c:499 +#: src/tar.c:516 #, fuzzy msgid "extract files to standard output" msgstr "Σφάλμα κατά την εγγÏαφή στην κανονική έξοδο" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " "place (METHOD='system')" msgstr "" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" msgstr "" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:554 +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 msgid "Handling of extended file attributes:" msgstr "" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" msgstr "" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" msgstr "" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" msgstr "" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" msgstr "" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" msgstr "" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" msgstr "" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" msgstr "" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" msgstr "" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "" -#: src/tar.c:603 +#: src/tar.c:627 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Δεν είναι δυνατή η επαλήθευση πολλαπλών αÏχειοθηκών" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:629 +#: src/tar.c:653 #, fuzzy msgid "Archive format selection:" msgstr "ΣυγκÏουόμενες επιλογές διαμόÏφωσης αÏχειοθήκης" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:660 +#: src/tar.c:684 #, fuzzy msgid "Compression options:" msgstr "ΣυγκÏουόμενες επιλογές συμπίεσης" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:687 -msgid "DIR" -msgstr "" - -#: src/tar.c:688 +#: src/tar.c:712 #, fuzzy msgid "change to directory DIR" msgstr "Δεν είναι δυνατή η Ï„Ïοποποίηση του Ï„Ïέχοντος καταλόγου" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +msgid "unquote input file or member names (default)" msgstr "" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +msgid "do not unquote input file or member names" msgstr "" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:729 +#: src/tar.c:761 #, fuzzy msgid "don't strip leading '/'s from file names" msgstr "ΑπομακÏÏνονται τα αÏχικά `%.*s' από τα ονόματα των μελών" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:735 +#: src/tar.c:767 msgid "begin at member MEMBER-NAME when reading the archive" msgstr "" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "" -#: src/tar.c:767 +#: src/tar.c:799 msgid "patterns match after any '/' (default for exclusion)" msgstr "" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "" -#: src/tar.c:775 +#: src/tar.c:807 #, fuzzy msgid "wildcards do not match '/'" msgstr "Ο τόμος %s δεν ταιÏιάζει %s" -#: src/tar.c:777 +#: src/tar.c:809 msgid "wildcards match '/' (default for exclusion)" msgstr "" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2134,317 +2173,310 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:802 -#, fuzzy +#: src/tar.c:834 msgid "print file modification times in UTC" -msgstr "ΆκυÏη κατάσταση δόθηκε σε επιλογή" +msgstr "" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:978 +#: src/tar.c:1010 #, fuzzy msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" msgstr "Ίσως δεν καθοÏίσατε παÏαπάνω από μία επιλογή `-Acdtrux'" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "ΣυγκÏουόμενες επιλογές συμπίεσης" -#: src/tar.c:1047 +#: src/tar.c:1079 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr " άγνωστος Ï„Ïπος αÏχείου %s\n" -#: src/tar.c:1071 +#: src/tar.c:1103 #, fuzzy msgid "Date sample file not found" msgstr "Το αÏχείο ημεÏομηνίας δεν βÏέθηκε" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Αντικατάσταση %s για άγνωστη διαμόÏφωση ημεÏομηνίας %s" -#: src/tar.c:1108 +#: src/tar.c:1140 #, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 -#, fuzzy, c-format +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 +#, c-format msgid "filter the archive through %s" -msgstr "%s: το αÏχείο είναι η αÏχειοθήκη; δεν αποθηκεÏτηκε" +msgstr "" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1295 +#: src/tar.c:1330 #, fuzzy msgid "Invalid owner or group ID" msgstr "ΆκυÏος ιδιοκτήτης" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "ΆκυÏος συντελεστής ομαδοποίησης" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "ΆκυÏο μέγεθος ταινίας" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "ΠαÏαπάνω από ένα ÏŒÏιο ημεÏομηνίας" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "ΆκυÏη κατάσταση δόθηκε σε επιλογή" -#: src/tar.c:1858 +#: src/tar.c:1925 #, fuzzy msgid "Invalid number" msgstr "ΆκυÏος αÏιθμός i-κόμβου" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "ΆκυÏο μέγεθος εγγÏαφής" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "Το μέγεθος της εγγÏαφής Ï€Ïέπει να είναι πολλαπλάσιο του %d." -#: src/tar.c:1975 +#: src/tar.c:2042 #, fuzzy msgid "Invalid number of elements" msgstr "ΆκυÏο μέγεθος ταινίας" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:2133 -#, fuzzy, c-format +#: src/tar.c:2205 +#, c-format msgid "Unknown density: '%c'" -msgstr " άγνωστος Ï„Ïπος αÏχείου %s\n" +msgstr "" -#: src/tar.c:2150 +#: src/tar.c:2222 #, fuzzy, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "" "Οι επιλογές `-[0-7][lmh]' δεν υποστηÏίζονται από *αυτήν* την εντολή tar" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "" -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 +#, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "%s: Δεν είναι δυνατή η αναζήτηση σε %s" + +#: src/tar.c:2389 #, fuzzy, c-format msgid "Old option '%c' requires an argument." msgstr "Παλιά επιλογή `%c' απαιτεί ÏŒÏισμα." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2389 -#, c-format -msgid "--occurrence cannot be used with %s" -msgstr "" - -#: src/tar.c:2408 +#: src/tar.c:2490 #, fuzzy msgid "Multiple archive files require '-M' option" msgstr "Πολλαπλά αÏχεία αÏχειοθηκών απαιτοÏν την επιλογή `-M'" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "Δεν είναι δυνατός ο συνδυασμός --listed-incremental με --newer" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "" -#: src/tar.c:2433 +#: src/tar.c:2515 #, fuzzy, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "%s: Η ετικέτα του τόμου είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î· (το ÏŒÏιο είναι %lu byte)" msgstr[1] "%s: Η ετικέτα του τόμου είναι Ï€Î¿Î»Ï Î¼ÎµÎ³Î¬Î»Î· (το ÏŒÏιο είναι %lu byte)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Δεν είναι δυνατή η επαλήθευση πολλαπλών αÏχειοθηκών" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Δεν είναι δυνατή η επαλήθευση των συμπιεσμένων αÏχειοθηκών" -#: src/tar.c:2450 -#, c-format -msgid "--verify cannot be used with %s" -msgstr "" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Δεν είναι δυνατή η χÏήση πολλαπλών συμπιεσμένων αÏχειοθηκών" -#: src/tar.c:2461 +#: src/tar.c:2543 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Δεν είναι δυνατή η ανανέωση των συμπιεσμένων αÏχειοθηκών" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2478 +#: src/tar.c:2560 msgid "--acls can be used only on POSIX archives" msgstr "" -#: src/tar.c:2483 +#: src/tar.c:2565 msgid "--selinux can be used only on POSIX archives" msgstr "" -#: src/tar.c:2488 +#: src/tar.c:2570 msgid "--xattrs can be used only on POSIX archives" msgstr "" -#: src/tar.c:2493 -#, c-format -msgid "--%s option cannot be used with %s" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "ΑÏνοÏμαι δειλά στη δημιουÏγία μίας κενής αÏχειοθήκης" -#: src/tar.c:2565 +#: src/tar.c:2669 #, fuzzy msgid "Options '-Aru' are incompatible with '-f -'" msgstr "Οι επιλογές `-Aru' δεν είναι συμβατές με `-f -'" -#: src/tar.c:2660 +#: src/tar.c:2766 #, fuzzy msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" msgstr "ΠÏέπει να καθοÏίσεις μία από τις επιλογές `-Acdtrux'" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, fuzzy, c-format msgid "%s: File shrank by %s byte" @@ -2452,101 +2484,101 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: Το αÏχείο συÏÏικνώθηκε κάτα %s byte" msgstr[1] "%s: Το αÏχείο συÏÏικνώθηκε κάτα %s byte" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "" -#: src/xheader.c:173 +#: src/xheader.c:174 #, fuzzy msgid "Time stamp is out of allowed range" msgstr "Η ένδειξη χÏόνου είναι εκτός εÏÏους" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "" -#: src/xheader.c:676 +#: src/xheader.c:677 #, fuzzy, c-format msgid "Extended header length %*s is out of range" msgstr "" "Η αÏχειοθήκη είναι υπογεγÏαμμένη με αλφαÏιθμητικά base-64 %s είναι εκτός του " "%s εÏÏους" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "" -#: src/xheader.c:740 +#: src/xheader.c:741 #, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, fuzzy, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "Η τιμή της αÏχειοθήκης %s είναι εκτός του %s εÏÏους %s..%s" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, fuzzy, c-format msgid "%s: not a valid timeout" msgstr "%s: ΆκυÏη ομάδα" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "" @@ -2554,7 +2586,7 @@ msgstr "" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, fuzzy, c-format msgid "Write checkpoint %u" msgstr "ΕγγÏαφή σημείου ελέγχου %d" @@ -2563,7 +2595,7 @@ msgstr "ΕγγÏαφή σημείου ελέγχου %d" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, fuzzy, c-format msgid "Read checkpoint %u" msgstr "Ανάγνωση σημείου ελέγχου %d" @@ -2634,11 +2666,8 @@ msgid "Synchronous execution options:" msgstr "" #: tests/genfile.c:163 -#, fuzzy msgid "OPTION" msgstr "" -"\n" -"ΧÏήση: %s [ΕΠΙΛΟΓΉ]...\n" #: tests/genfile.c:164 msgid "" @@ -2769,7 +2798,7 @@ msgstr "%s: Δεν είναι δυνατή η αναζήτηση σε %s" #: tests/genfile.c:692 #, fuzzy, c-format msgid "cannot truncate `%s'" -msgstr "%s: Δεν είναι δυνατή η αναζήτηση σε %s" +msgstr "%s: Δεν είναι δυνατή η μετονομασία σε %s" #: tests/genfile.c:701 #, fuzzy, c-format @@ -2779,7 +2808,7 @@ msgstr "`%s' η εντολή απέτυχε" #: tests/genfile.c:706 #, fuzzy, c-format msgid "cannot unlink `%s'" -msgstr "%s: Δεν είναι δυνατή η αναζήτηση σε %s" +msgstr "%s: Δεν είναι δυνατή η συμβολική σÏνδεση στο %s" #: tests/genfile.c:833 #, c-format @@ -2816,86 +2845,12 @@ msgstr "" msgid "--stat requires file names" msgstr "--ΚατακεÏματισμένα ονόματα αÏχείων--\n" -#, fuzzy -#~ msgid "Cannot get working directory" -#~ msgstr "Δεν είναι δυνατή η Ï„Ïοποποίηση του Ï„Ïέχοντος καταλόγου" - -#, fuzzy -#~ msgid "Invalid group" -#~ msgstr "%s: ΆκυÏη ομάδα" - -#, fuzzy -#~ msgid "%s: Directory removed before we read it" -#~ msgstr "%s: Το αÏχείο απομακÏÏνθηκε Ï€Ïιν το διαβάσουμε" - -#, fuzzy -#~ msgid "Cannot restore working directory" -#~ msgstr "Δεν είναι δυνατή η αποθήκευση του Ï„Ïέχοντος καταλόγου" - -#, fuzzy -#~ msgid "Cannot resolve hostname %s" -#~ msgstr "%s: Δεν είναι δυνατή η μετονομασία σε %s" +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "Δεν είναι δυνατός ο συνδυασμός --listed-incremental με --newer" #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: παÏάνομη επιλογή -- %c\n" -#~ msgid "Reading %s\n" -#~ msgstr "Ανάγνωση %s\n" - -#, fuzzy -#~ msgid "" -#~ "\n" -#~ "Report bugs to <%s>.\n" -#~ msgstr "" -#~ "\n" -#~ "ΑναφοÏά σφαλμάτων στο .\n" - -#, fuzzy -#~ msgid "filter the archive through compress" -#~ msgstr "%s: το αÏχείο είναι η αÏχειοθήκη; δεν αποθηκεÏτηκε" - -#, fuzzy -#~ msgid "filter the archive through lzma" -#~ msgstr "%s: το αÏχείο είναι η αÏχειοθήκη; δεν αποθηκεÏτηκε" - -#, fuzzy -#~ msgid "filter the archive through lzop" -#~ msgstr "%s: το αÏχείο είναι η αÏχειοθήκη; δεν αποθηκεÏτηκε" - -#~ msgid "rmtd: Cannot allocate buffer space\n" -#~ msgstr "rmtd: Δεν είναι δυνατή η δέσμευση Ï€ÏοσωÏÎ¹Î½Î¿Ï Î±Ï€Î¿Î¸Î·ÎºÎµÏ…Ï„Î¹ÎºÎ¿Ï Ï‡ÏŽÏου \n" - -#~ msgid "Cannot allocate buffer space" -#~ msgstr "Δεν είναι δυνατή η δέσμευση Ï€ÏοσωÏÎ¹Î½Î¿Ï Î±Ï€Î¿Î¸Î·ÎºÎµÏ…Ï„Î¹ÎºÎ¿Ï Ï‡ÏŽÏου" - -#~ msgid "Try `%s --help' for more information.\n" -#~ msgstr "ΠÏοσπαθήστε `%s --help' για πεÏισσότεÏες πληÏοφοÏίες.\n" - -#, fuzzy -#~ msgid "" -#~ "Usage: %s [OPTION]\n" -#~ "Manipulate a tape drive, accepting commands from a remote process.\n" -#~ "\n" -#~ " --version Output version info.\n" -#~ " --help Output this help.\n" -#~ msgstr "" -#~ "ΧÏήση: %s [ΕΠΙΛΟΓΉ]\n" -#~ "ΔιαχείÏιση συσκευής αποθήκευσης ταινίας, αποδοχή εντολών από " -#~ "απομακÏυσμένη διεÏγασία.\n" -#~ "\n" -#~ " --version Εμφάνιση πληÏοφοÏιών έκδοσης.\n" -#~ " --help Εμφάνιση αυτής της βοήθειας.\n" - -#, fuzzy -#~ msgid "Seek offset error" -#~ msgstr "Η μετατόπιση αναζήτησης είναι εκτός εÏÏους" - -#~ msgid "Premature end of file" -#~ msgstr "ΠÏόωÏο τέλος αÏχείου" - -#~ msgid "Error is not recoverable: exiting now" -#~ msgstr "Το σφάλμα δεν είναι επανοÏθώσιμο: τεÏματισμός Ï„ÏŽÏα" - #~ msgid "block size" #~ msgstr "μέγεθος μπλοκ" @@ -2911,6 +2866,9 @@ msgstr "--ΚατακεÏματισμένα ονόματα αÏχείων--\n" #~ msgid "tar (grandchild)" #~ msgstr "tar (εγγόνι)" +#~ msgid "Reading %s\n" +#~ msgstr "Ανάγνωση %s\n" + #~ msgid "WARNING: No volume header" #~ msgstr "ΠΡΟΕΙΔΟΠΟΊΗΣΗ: Καμία κεφαλίδα του πλήθους" @@ -2926,6 +2884,9 @@ msgstr "--ΚατακεÏματισμένα ονόματα αÏχείων--\n" #~ msgid "Visible long name error" #~ msgstr "ΟÏατό σφάλμα μεγάλων ονομάτων" +#~ msgid "Error is not recoverable: exiting now" +#~ msgstr "Το σφάλμα δεν είναι επανοÏθώσιμο: τεÏματισμός Ï„ÏŽÏα" + #~ msgid "Device number out of range" #~ msgstr "Ο αÏιθμός της συσκευής είναι εκτός εÏÏους" @@ -2935,9 +2896,6 @@ msgstr "--ΚατακεÏματισμένα ονόματα αÏχείων--\n" #~ msgid "Renamed %s to %s" #~ msgstr "Μετονομάστηκε %s σε %s" -#~ msgid "%s: Cannot symlink to %s" -#~ msgstr "%s: Δεν είναι δυνατή η συμβολική σÏνδεση στο %s" - #~ msgid "Symlinked %s to %s" #~ msgstr "Συμβολικός δεσμός %s στο %s" @@ -2947,6 +2905,12 @@ msgstr "--ΚατακεÏματισμένα ονόματα αÏχείων--\n" #~ msgid "Missing file name after -C" #~ msgstr "Λείπει όνομα αÏχείου μετά -C" +#~ msgid "rmtd: Cannot allocate buffer space\n" +#~ msgstr "rmtd: Δεν είναι δυνατή η δέσμευση Ï€ÏοσωÏÎ¹Î½Î¿Ï Î±Ï€Î¿Î¸Î·ÎºÎµÏ…Ï„Î¹ÎºÎ¿Ï Ï‡ÏŽÏου \n" + +#~ msgid "Cannot allocate buffer space" +#~ msgstr "Δεν είναι δυνατή η δέσμευση Ï€ÏοσωÏÎ¹Î½Î¿Ï Î±Ï€Î¿Î¸Î·ÎºÎµÏ…Ï„Î¹ÎºÎ¿Ï Ï‡ÏŽÏου" + #~ msgid "" #~ "This program comes with NO WARRANTY, to the extent permitted by law.\n" #~ "You may redistribute it under the terms of the GNU General Public " @@ -2959,6 +2923,9 @@ msgstr "--ΚατακεÏματισμένα ονόματα αÏχείων--\n" #~ "License;\n" #~ "δείτε το αÏχείο με όνομα COPYING για λεπτομέÏειες." +#~ msgid "Premature end of file" +#~ msgstr "ΠÏόωÏο τέλος αÏχείου" + #~ msgid "rmtd: Garbage command %c\n" #~ msgstr "rmtd: Εντολή αποÏÏιμμάτων %c\n" diff --git a/po/eo.gmo b/po/eo.gmo index 76463cb..2abb05c 100644 Binary files a/po/eo.gmo and b/po/eo.gmo differ diff --git a/po/eo.po b/po/eo.po index 227081c..e7cb071 100644 --- a/po/eo.po +++ b/po/eo.po @@ -3,20 +3,21 @@ # This file is distributed under the same license as the tar package. # Felipe Castro , 2013. # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" -"Project-Id-Version: tar 1.26\n" +"Project-Id-Version: tar 1.27\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" -"PO-Revision-Date: 2013-05-27 08:08-0300\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" +"PO-Revision-Date: 2013-10-07 11:32-0300\n" "Last-Translator: Felipe Castro \n" "Language-Team: Esperanto \n" -"Language: \n" +"Language: Esperanto\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"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.5.4\n" #: gnu/argmatch.c:135 #, c-format @@ -78,7 +79,7 @@ msgid " [OPTION...]" msgstr " [MODIFILO...]" #: gnu/argp-help.c:1686 -#, fuzzy, c-format +#, c-format msgid "Try '%s --help' or '%s --usage' for more information.\n" msgstr "Provu '%s --help' aÅ­ '%s --usage' por pli da informo.\n" @@ -99,7 +100,7 @@ msgstr "montri tiun ĉi help-liston" msgid "give a short usage message" msgstr "montri mallongan mesaÄon pri la uzmaniero" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "NOMO" @@ -138,9 +139,9 @@ msgid "write error" msgstr "skrib-eraro" #: gnu/getopt.c:549 gnu/getopt.c:578 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: modifilo '%s' estas plursenca\n" +msgstr "%s: modifilo '%s' estas plursenca; ebloj:" #: gnu/getopt.c:626 gnu/getopt.c:630 #, c-format @@ -435,7 +436,7 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: funkcio %s fiaskis" @@ -444,56 +445,56 @@ msgstr "%s: funkcio %s fiaskis" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: Averto: funkcio %s fiaskis" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: ne eblas ÅanÄi reÄimon al %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: ne eblas ÅanÄi posedon al UID %lu, GID %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: ne eblas rekt-ligi al %s" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: leg-eraro ĉe bajto %s, dum lego de %lu bajto" msgstr[1] "%s: leg-eraro ĉe bajto %s, dum lego de %lu bajtoj" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Averto: leg-eraro ĉe bajto %s, dum lego de %lu bajto" msgstr[1] "%s: Averto: leg-eraro ĉe bajto %s, dum lego de %lu bajtoj" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: ne eblas apliki 'seek' al %s" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: Averto: ne eblas apliki 'seek' al %s" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: ne eblas krei simbol-ligon al %s" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -539,9 +540,9 @@ msgid "Cannot connect to %s: resolve failed" msgstr "Ne eblas konekti al %s: adres-trovo fiaskis" #: lib/rtapelib.c:502 -#, fuzzy, c-format +#, c-format msgid "Cannot redirect files for remote shell" -msgstr "Ne eblas lanĉi foran Åelon" +msgstr "Ne eblas redirektigi dosierojn por fora Åelo" #: lib/rtapelib.c:516 #, c-format @@ -592,8 +593,8 @@ msgstr "Neatenditaj argumentoj" msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "Manipuli bendolegilon, akceptante komandojn el fora procezo" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "NUMERO" @@ -601,10 +602,10 @@ msgstr "NUMERO" msgid "set debug level" msgstr "difini rafinigan nivelon" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "DOSIERO" @@ -626,103 +627,111 @@ msgstr "tro da argumentoj" msgid "Garbage command" msgstr "Ruba komando" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Tio ĉi ne Åajnas esti arÄ¥ivo tar" -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" -msgstr "Bajtoj entute skribitaj" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" msgstr "Bajtoj entute legitaj" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "Bajtoj entute skribitaj" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Bajtoj entute forigitaj: %s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(dukto)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "Malvalida valoro por 'record_size'" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Neniu arÄ¥iv-nomo estas indikita" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Ne eblas kontroli arÄ¥ivon de ĉefa en/eligujo" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "ArÄ¥ivo estas densigita. Uzu modifilon %s" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Ne eblas Äisdatigi densigitajn arÄ¥ivojn" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "Ĉe komenco de bendo, ni ĉesas nun" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "Tro multaj eraroj, ni ĉesas" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Rikord-grando = %lu bloko" msgstr[1] "Rikord-grando = %lu blokoj" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "Malrektigita bloko (%lu bajto) en arÄ¥ivo" msgstr[1] "Malrektigita bloko (%lu bajtoj) en arÄ¥ivo" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "Ne eblas retropaÅi arÄ¥ivan dosieron; Äi eble ne legeblos sen -i" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "'rmtlseek' ne haltis ĉe rikord-limo" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: enhavas malvalidan volum-numeron" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "Datumvolum-numero troigas" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Preparu datumvolumon #%d por %s kaj premu enig-klavon: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "EOF kie respondo de uzanto estis atendata" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "AVERTO: arÄ¥ivo estas malkompleta" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -733,67 +742,67 @@ msgstr "" " q Ĉesigi tar\n" " y aÅ­ novlinio DaÅ­rigi operacion\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Generi subÅelon\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? Montri tiun ĉi liston\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Neniu nova datumvolumo: ni eliras.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "Dosiernomo ne estis indikata. Reprovu.\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Malvalida enigo. Tajpu ? por helpo.\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "La komando %s fiaskis" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" "%s eble estas daÅ­rigata en tiu ĉi datumvolumo: la kapo enhavas tranĉitan " "nomon" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s ne estas daÅ­rigata en tiu ĉi datumvolumo" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s estas malkorekta grando (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Tiu ĉi datumvolumo estas for de sekvo (%s - %s != %s)" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "La arÄ¥ivo ne estas markita por kongrui al %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "La datumvolumo %s ne kongruas al %s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -801,7 +810,7 @@ msgstr "" "%s: dosiernomo tro longas por esti konservata en GNU-plurvoluma kapo, ni " "tranĉis" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "skribo ne finiÄis ĉe bloko-limo" @@ -812,16 +821,16 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Eblis legi %lu el %lu bajto" msgstr[1] "Eblis legi %lu el %lu bajtoj" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "Enhavo malsamas" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "Neatendita EOF en arÄ¥ivo" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "Dosiertipo malsamas" @@ -841,7 +850,7 @@ msgstr "GID malsamas" msgid "Mod time differs" msgstr "Modif-tempo malsamas" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Grando malsamas" @@ -858,36 +867,36 @@ msgstr "Simbol-ligo malsamas" msgid "Device number differs" msgstr "Aparatnumero malsamas" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Kontroli " -#: src/compare.c:471 -#, fuzzy, c-format +#: src/compare.c:473 +#, c-format msgid "%s: Unknown file type '%c', diffed as normal file" -msgstr "%s: nekonata dosiertipo '%c', komparita kiel normala dosiero" +msgstr "%s: nekonata dosiertipo '%c', ni komparas kiel normalan dosieron" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "ArÄ¥ivo enhavas dosiernomojn kun forigitaj antaÅ­iraj prefiksoj." -#: src/compare.c:533 +#: src/compare.c:535 msgid "Archive contains transformed file names." msgstr "ArÄ¥ivo enhavas transformitajn dosiernomojn." -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "Kontrolo povas malsukcesi lokigi originalajn dosierojn." -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "KONTROLA MALSUKCESO: %d malvalida kapo detektita" msgstr[1] "KONTROLA MALSUKCESO: %d malvalidaj kapoj detektitaj" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "Izolita nul-bloko ĉe %s" @@ -933,55 +942,55 @@ msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "%s: dosiero malpligrandiÄis je %s bajto; ni Åtopas per nulo" msgstr[1] "%s: dosiero malpligrandiÄis je %s bajtoj; ni Åtopas per nuloj" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: dosiero estas en malsama dosiersistemo; ne Åutita" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "enhavo ne estas Åutita" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: nekonata dosiertipo; dosiero estas preteratentita" -#: src/create.c:1549 +#: src/create.c:1551 #, c-format msgid "Missing links to %s." msgstr "Mankas ligoj al %s." -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: dosiero estas nemodifita; ne Åutita" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: dosiero estas la arÄ¥ivo; ne Åutita" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "dosierujo ne estas Åutita" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: dosiero ÅanÄis dum ni legas Äin" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: konektilo estis preteratentata" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: pordo estis preteratentata" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Ni saltas al sekva kapo" @@ -1007,7 +1016,7 @@ msgstr "%s: neatendita malkohero dum kreo de dosierujo" #: src/extract.c:705 #, c-format msgid "%s: skipping existing file" -msgstr "" +msgstr "%s: ni preterpasas ekzistantan dosieron" #: src/extract.c:821 #, c-format @@ -1027,12 +1036,12 @@ msgstr "Ni provas elpreni simbolajn ligojn kiel rektajn ligojn" msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: ne eblas eltiri -- dosiero daÅ­riÄas el alia datumvolumo" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" msgstr "Neatendita long-noma kapo" #: src/extract.c:1542 -#, fuzzy, c-format +#, c-format msgid "%s: Unknown file type '%c', extracted as normal file" msgstr "%s: nekonata dosiertipo '%c', ni eltiras kiel normalan dosieron" @@ -1062,164 +1071,165 @@ msgid "%s: Directory is new" msgstr "%s: dosierujo estas nova" #: src/incremen.c:566 -#, fuzzy, c-format +#, c-format msgid "%s: directory is on a different filesystem; not dumped" -msgstr "%s: dosiero estas en malsama dosiersistemo; ne Åutita" +msgstr "%s: dosierujo estas en malsama dosiersistemo; ne Åutita" #: src/incremen.c:587 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: dosierujo estas renomigita" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "Malvalida temp-indiko" -#: src/incremen.c:1045 -#, fuzzy +#: src/incremen.c:1047 msgid "Invalid modification time" -msgstr "Malvalida modif-tempo (sekundoj)" +msgstr "Malvalida modif-tempo" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "Malvalida modif-tempo (nanosekundoj)" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "Malvalida aparatnumero" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Malvalida numero 'inode'" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" -msgstr "" +msgstr "%s: bajto %s: %s %.*s... tro longas" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" -msgstr "Neatendita EOF en specimena dosiero" +msgstr "Neatendita EOF en statkopia dosiero" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" -msgstr "" +msgstr "%s: bajto %s: %s %s sekvata de malvalida bajto 0x%02x" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" +"%s: bajto %s: (valida intervalo %s..%s)\n" +"\t%s %s" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" -msgstr "" +msgstr "%s: bajto %s: %s %s" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" -msgstr "" +msgstr "%s: bajto %s: %s" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "Mankas rikord-finiganto" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "MalÄusta aldona dosier-formo" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "Nesubtenata versio de aldona formo: %" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "FuÅa 'dumpdir': ni atendis '%c' sed trovis %#3o" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "FuÅa 'dumpdir': duobligita 'X'" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "FuÅa 'dumpdir': malplena nomo en 'R'" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "FuÅa 'dumpdir': 'T' ne antaÅ­sekvata de 'R'" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "FuÅa 'dumpdir': malplena nomo en 'T'" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "FuÅa 'dumpdir': ni atendis '%c' sed trovis finon de datumaro" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "FuÅa 'dumpdir': neniam uzata 'X'" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Ne eblas krei provizoran dosierujon uzante la Åablonon %s" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: ni ne netigas dosierujon: ne eblas apliki 'stat'" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: dosierujo estas en malsama aparato: ni ne netigas" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: forigo de %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: ne eblas forigi" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: ni malinkluzivigas" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "bloko %s: ** Bloko de NULOj **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "bloko %s: ** Fino de dosiero **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "bloko %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Vakoj en kapo kie numera valoro %s estas atendata" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1227,124 +1237,123 @@ msgstr "" "komplementon de du" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "ArÄ¥iva okuma valoro %.*s estas for de intervalo %s" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "ArÄ¥ivo enhavas malaktualajn kapojn 'base-64'" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Signita ĉeno 'base-64' de arÄ¥ivo (%s) estas for de intervalo %s" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Valoro 'base-256' de arÄ¥ivo estas for de intervalo %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "ArÄ¥ivo enhavas %.*s kie estas atendata numera valoro %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "ArÄ¥iva valoro %s estas for de intervalo %s: %s..%s" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " kunligo al %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " nekonata dosiertipo %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--Longa ligo--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--Longa nomo--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Voluma kapo--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--DaÅ­rigita ĉe bajto %s--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Kreado de dosierujo:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "Alinomigo de %s al %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: ne eblas renomigi al %s" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "Renomigo de %s reen al %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: dosiero estis forigata antaÅ­ ol ni legis Äin" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "ida procezo" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "interproceza kanalo" #: src/names.c:360 -#, fuzzy msgid "command line" -msgstr "La komando %s fiaskis" +msgstr "komandlinio" #: src/names.c:378 -#, fuzzy, c-format +#, c-format msgid "%s: file list requested from %s already read from %s" -msgstr "%s: dosierlisto jam estas legita" +msgstr "%s: dosierlisto petita el %s jam estas legita el %s" -#: src/names.c:448 -#, fuzzy, c-format +#: src/names.c:448 src/checkpoint.c:274 +#, c-format msgid "cannot split string '%s': %s" -msgstr "ne eblas difini horon por '%s'" +msgstr "ne eblas apartigi ĉenon '%s': %s" #: src/names.c:490 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: lego de dosiernomo enhavas nul-signon" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "Åœablon-kongruaj signoj uzataj en dosiernomoj" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1352,56 +1361,55 @@ msgstr "" "Uzu --wildcards por ebligi Åablon-kongruon, aŭ --no-wildcards por eviti tiun " "ĉi averton" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: ne trovita en arÄ¥ivo" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: postulata apero ne estis trovata en arÄ¥ivo" -#: src/names.c:876 +#: src/names.c:879 #, c-format msgid "Archive label mismatch" msgstr "Miskongruo de arÄ¥iva etikedo" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "Uzo de la modifilo -C ene de dosierlisto ne estas permesata kun --listed-" "incremental" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Nur unu modifilo -C estas permesata kun --listed-incremental" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "Ambaŭ modifiloj '-%s' kaj '-%s' postulas ĉefenigujon" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s: malvalida arÄ¥iv-formo" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "GNU-trajtoj estas dezirataj en neakordigebla arÄ¥iv-formo" -#: src/tar.c:255 -#, fuzzy, c-format +#: src/tar.c:264 +#, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." msgstr "" "Nekonata citila stilo '%s'. Provu '%s --quoting-stile=help' por havigi " "liston." -#: src/tar.c:364 -#, fuzzy +#: src/tar.c:378 msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1420,8 +1428,7 @@ msgstr "" "tar.\n" " tar -xf archive.tar # Eltiras ĉiujn dosierojn el archive.tar.\n" -#: src/tar.c:373 -#, fuzzy +#: src/tar.c:387 msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" "The version control may be set with --backup or VERSION_CONTROL, values " @@ -1442,79 +1449,79 @@ msgstr "" " nil, existing numerigi se numeritaj jam ekzistas, alie generi simplajn\n" " never, simple ĉiam generi simplajn savkopiojn\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "Ĉefa operacia reÄimo:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "listigi la enhavon de arÄ¥ivo" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "eltiri dosierojn el arÄ¥ivo" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "krei novan arÄ¥ivon" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "trovi malsamojn inter la arÄ¥ivo kaj la dosiersistemo" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "postmeti dosierojn al la fino de arÄ¥ivo" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "nur postmeti dosierojn pli novajn ol la kopio en arÄ¥ivo" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "postmeti tar-dosierojn al arÄ¥ivo" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "forigi el la arÄ¥ivo (ne en magnet-bendoj!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "testi la arÄ¥ivan volum-etikedon kaj eliri" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "Operaciaj modifiloj:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "trakti disajn dosierojn Åpareme" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "ĈEFA[.KROMA]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "difini version de la uzota disa formo (implicas --sparse)" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "trakti malnovan GNU-forman aldonan savkopion" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "trakti novan GNU-forman aldonan savkopion" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "Åut-nivelo por kreita listita-aldona arÄ¥ivo" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "ne eliri kun nenulo pro nelegeblaj dosieroj" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1526,132 +1533,139 @@ msgstr "" "list kaj kiam listo de dosieroj estas indikita en la komandlinio aÅ­ per la " "modifilo -T; NUMERO apriore estas 1" -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "arÄ¥ivo estas serĉebla" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "arÄ¥ivo ne estas serĉebla" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "ne kontroli aparat-numerojn dum kreo de aldonaj arÄ¥ivoj" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "kontroli aparat-numerojn dum kreo de aldonaj arÄ¥ivoj (aprioras)" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "AnstataÅ­iga administro:" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "provi kontroli la arÄ¥ivon post skribi Äin" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "forigi dosierojn post aldoni ilin al la arÄ¥ivo" -#: src/tar.c:471 -#, fuzzy +#: src/tar.c:485 msgid "don't replace existing files when extracting, treat them as errors" -msgstr "ne anstataÅ­igi ekzistantajn dosierojn dum eltiro" +msgstr "" +"ne anstataÅ­igi ekzistantajn dosierojn dum eltiro, trakti ilin kiel erarojn" -#: src/tar.c:474 -#, fuzzy +#: src/tar.c:488 msgid "don't replace existing files when extracting, silently skip over them" -msgstr "ne anstataÅ­igi ekzistantajn dosierojn dum eltiro" +msgstr "" +"ne anstataÅ­igi ekzistantajn dosierojn dum eltiro, silente preterpasi ilin" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "" "ne anstataÅ­igi ekzistantajn dosierojn kiuj pli novas ol iliaj arÄ¥ivaj kopioj" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "anstataÅ­igi ekzistantajn dosierojn dum eltiro" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "forigi ĉiun dosieron antaŭ ol eltiri sur Äi" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "malplenigi hierarkiojn antaŭ ol eltiri dosierujon" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "teni metadatumaron pri ekzistantaj dosierujoj" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "anstataÅ­igi metadatumaron pri ekzistantaj dosierujoj dum eltiro (aprioras)" -#: src/tar.c:490 -#, fuzzy +#: src/tar.c:504 msgid "preserve existing symlinks to directories when extracting" -msgstr "anstataÅ­igi ekzistantajn dosierojn dum eltiro" +msgstr "teni ekzistantajn simbolajn ligojn al dosierujoj dum eltiro" + +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "UJO" -#: src/tar.c:496 +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "Elekti eligfluon:" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "eltiri dosierojn al ĉefeligujo" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "KOMANDO" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "dukti eltiritajn dosierojn al alia programo" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "preteratenti elir-kodojn de idoj" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "trakti ne-nulajn elir-kodojn de idoj kiel erarojn" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Traktado de dosier-atributoj:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "devigi NOMOn kiel posedanton por aldonataj dosieroj" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "devigi NOMOn kiel grupon por aldonataj dosieroj" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "DATO-AŬ-DOSIERO" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "difini 'mtime' por aldonataj dosieroj el DATO-AŬ-DOSIERO" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "ÅœANÄœOJ" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "devigi (simbolajn) reÄimajn ÅœANÄœOJn por aldonataj dosieroj" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "METODO" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " @@ -1661,11 +1675,11 @@ msgstr "" "lego (METODO='replace'; aprioras) aŭ per ne-difino de la horoj en la unua " "loko (METODO='system')" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "ne eltiri dosieran modif-horon" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" @@ -1673,19 +1687,19 @@ msgstr "" "provi eltiri dosierojn kun la sama posedanteco kiel ekzistanta en la arÄ¥ivo " "(aprioras por ĉefuzanto)" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "eltiri dosierojn kiel vi mem (aprioras por ordinaraj uzantoj)" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "ĉiam uzi numerojn por uzant/grup-nomoj" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "eltiri informon pri dosier-permesoj (aprioras por ĉefuzanto)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1693,16 +1707,17 @@ msgstr "" "apliki 'umask' de uzanto dum eltiro de permesoj por la arÄ¥ivo (aprioras por " "ordinaraj uzantoj)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" +"membraj argumentoj estas listigitaj samorde ol la dosieroj en la arÄ¥ivo" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "same ol uzi kaj -p kaj -s" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1710,180 +1725,187 @@ msgstr "" "prokrastigi difinon de modif-horoj kaj permesoj de eltiritaj dosierujoj Äis " "la fino de la eltirado" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "nuligi la efikon de la modifilo --delay-directory-restore" -#: src/tar.c:554 -#, fuzzy +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 msgid "Handling of extended file attributes:" -msgstr "Traktado de dosier-atributoj:" +msgstr "Traktado de etenditaj dosier-atributoj:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" -msgstr "" +msgstr "Ebligi subtenon al etenditaj atributoj" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" -msgstr "" +msgstr "Malebligi subtenon al etenditaj atributoj" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" -msgstr "" +msgstr "MASKO" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" -msgstr "" +msgstr "indiki la inkluzivan Åablonon por klavoj xattr" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" -msgstr "" +msgstr "indiki la malinkluzivan Åablonon por klavoj xattr" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" -msgstr "" +msgstr "Ebligi subtenon al la kunteksto SELinux" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" -msgstr "" +msgstr "Malebligi subtenon al la kunteksto SELinux" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" -msgstr "" +msgstr "Ebligi subtenon al POSIX ACL-oj" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" -msgstr "" +msgstr "Malebligi subtenon al POSIX ACL-oj" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "Aktivigo kaj elekto de aparato:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ARĤIVO" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "uzi arÄ¥ivan dosieron aŭ aparaton ARĤIVO" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "arÄ¥iva dosiero estas loka eĉ se Äi havas dupunkton" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "uzi indikitan KOMANDOn rmt anstataŭ rmt" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "uzi deforan KOMANDOn anstataŭ rsh" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "indiki diskon kaj denson" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "krei/listigi/eltiri plur-voluman arÄ¥ivon" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "ÅanÄi bend-aparaton post skribi NUMERO x 1024 bajtojn" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "lanĉi skripton je fino de ĉiu bend-aparato (implicas -M)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "uzi/Äisdatigi la volum-numeron en DOSIERO" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "Aparat-blokoj:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "BLOKOJ" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "BLOKOJ x 512 bajtoj por rikordo" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "NUMERO da bajtoj por rikordo, oblo de 512" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "preteratenti nuligitajn blokojn en arÄ¥ivo (signifas EOF)" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "reblokigi dum ni legas (por duktoj 4.2BSD)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "Elekto de arÄ¥iv-formo:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "FORMO" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "krei arÄ¥ivon el indikita formo" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "FORMO estas unu el la jenaj:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "malnova formo V7 tar" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "Formo GNU kiel en tar <= 1.12" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "Formo de GNU-tar 1.13.5" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "Formo POSIX 1003.1-1988 (ustar)" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "Formo POSIX 1003.1-2001 (pax)" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "same ol pax" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "same ol --format=v7" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "same ol --format=posix" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "Ålosilo[[:]=valoro][,Ålosilo[[:]=valoro]]..." -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "kontroli pax-Ålosilojn" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "TEKSTO" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1891,173 +1913,183 @@ msgstr "" "krei arÄ¥ivon kun volum-nomo TEKSTO; dum listigo/eltiro, uzi TEKSTOn kiel " "ĵokeran Åablonon por volum-nomo" -#: src/tar.c:660 +#: src/tar.c:684 msgid "Compression options:" msgstr "Densigaj modifiloj:" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "uzi arÄ¥ivan sufikson por determini la densigan programon" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "ne uzi la arÄ¥ivan sufikson por determini la densigan programon" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "PROG" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "filtri tra PROG (devas akcepti -d)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "Loka dosier-elekto:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" "aldoni la indikitan DOSIEROn al la arÄ¥ivo (utilas se Äia nomo komencas per " "streketo)" -#: src/tar.c:687 -msgid "DIR" -msgstr "UJO" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "ÅanÄi al la dosierujo UJO" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "havigi nomojn por eltiri aÅ­ krei el DOSIERO" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "-T legas nul-finigitajn nomojn, malebligas -C" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "malebligi la efikon de la antaÅ­a modifilo --null" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" msgstr "malcitigi dosiernomojn legitajn per -T (aprioras)" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" msgstr "ne malcitigi dosiernomojn legitajn per -T" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "ÅœABLONO" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" -msgstr "ekskluzivi dosierojn, indikitaj kiel ÅœABLONO" +msgstr "malinkluzivi dosierojn, indikitaj kiel ÅœABLONO" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" -msgstr "ekskluzivi Åablonojn listigitajn en DOSIERO" +msgstr "malinkkluzivi Åablonojn listigitajn en DOSIERO" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -"ekskluzivi enhavojn de dosierujoj enhavantaj CACHEDIR.TAG, krom por la " +"malinkluzivi enhavojn de dosierujoj enhavantaj CACHEDIR.TAG, krom por la " "markdosiero mem" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" -msgstr "ekskluzivi ĉion sub dosierujoj enhavantaj CACHEDIR.TAG" +msgstr "malinkluzivi ĉion sub dosierujoj enhavantaj CACHEDIR.TAG" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" -msgstr "ekskluzivi dosierujojn enhavantajn CACHEDIR.TAG" +msgstr "malinkluzivi dosierujojn enhavantajn CACHEDIR.TAG" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -"ekskluzivi enhavojn de dosierujoj enhavantaj DOSIEROn, krom por DOSIERO mem" +"malinkluzivi enhavojn de dosierujoj enhavantaj DOSIEROn, krom por DOSIERO mem" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" -msgstr "ekskluzivi ĉion sub dosierujoj enhavantaj DOSIERO" +msgstr "malinkluzivi ĉion sub dosierujoj enhavantaj DOSIERO" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" -msgstr "ekskluzivi dosierujojn enhavantajn DOSIEROn" +msgstr "malinkluzivi dosierujojn enhavantajn DOSIEROn" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" -msgstr "ekskluzivi versikontrol-sistemajn dosierujojn" +msgstr "malinkluzivi versikontrol-sistemajn dosierujojn" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" -msgstr "ekskluzivi savkopiajn kaj Ålosajn dosierojn" +msgstr "malinkluzivi savkopiajn kaj Ålosajn dosierojn" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "eviti malsupreniri aÅ­tomate en dosierujoj" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "resti en loka dosiersistemo dum kreo de arÄ¥ivo" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "rekursigi en dosierujojn (aprioras)" -#: src/tar.c:729 -#, fuzzy +#: src/tar.c:761 msgid "don't strip leading '/'s from file names" -msgstr "ne demeti antaÅ­irajn '/'-oj el dosiernomoj" +msgstr "ne demeti antaÅ­irajn '/'-ojn el dosiernomoj" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "sekvi simbol-ligojn; arÄ¥ivi kaj Åuti la dosierojn, kiujn ili indikas" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "" "sekvi rekt-ligojn; arÄ¥ivi kaj Åuti la dosierojn, kiujn ili referencigas" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "MEMBRO-NOMO" -#: src/tar.c:735 -#, fuzzy +#: src/tar.c:767 msgid "begin at member MEMBER-NAME when reading the archive" -msgstr "komenci per la membro MEMBRO-NOMO en la arÄ¥ivo" +msgstr "komenci per la membro MEMBRO-NOMO dum lego de la arÄ¥ivo" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "nur konservi dosierojn pli novajn ol DATO-AŬ-DOSIERO" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "DATO" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "kompari daton kaj horon nur kiam datumaro ÅanÄis" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "KONTROLO" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "savkopii antaÅ­ ol forigi, elekti versi-KONTROLOn" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "ĈENO" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -2065,100 +2097,97 @@ msgstr "" "savkopii antaÅ­ ol forigi, anstataÅ­igi ordinaran sufikson ('~' krom se " "anstataÅ­igita de medi-variablo SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "Dosiernomaj transformigoj:" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "demeti NUMERO antaÅ­irajn komponantojn el dosiernomoj dum eltiro" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "ESPRIMO" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "uzi sed-anstataÅ­igan ESPRIMOn por transformigi dosiernomojn" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "Dosiernom-kongruaj modifiloj (influas kaj ekskluzivajn kaj inkluzivajn " "Åablonojn):" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "preteratenti usklecon" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "Åablonoj kongruas al komenco de dosiernomo" -#: src/tar.c:767 -#, fuzzy +#: src/tar.c:799 msgid "patterns match after any '/' (default for exclusion)" -msgstr "Åablonoj kongruas post iu ajn '/' (aprioras por ekskluzivo)" +msgstr "Åablonoj kongruas post iu ajn '/' (aprioras por malinkluzivo)" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "uskleca kongruo (aprioras)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" -msgstr "uzi ĵokerojn (aprioras por ekskluzivo)" +msgstr "uzi ĵokerojn (aprioras por malinkluzivo)" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "laÅ­vorta ĉena kongruo" -#: src/tar.c:775 -#, fuzzy +#: src/tar.c:807 msgid "wildcards do not match '/'" msgstr "ĵokeroj ne kongruas kun '/'" -#: src/tar.c:777 -#, fuzzy +#: src/tar.c:809 msgid "wildcards match '/' (default for exclusion)" -msgstr "ĵokeroj kongruas kun '/' (aprioras por ekskluzivo)" +msgstr "ĵokeroj kongruas kun '/' (aprioras por malinkluzivo)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Informa eligo:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "detale listigi procezitajn dosierojn" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "ÅœLOSILVORTO" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "avert-kontrolo" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "montri progres-mesaÄojn je ĉiu NUMERa rikordo (aprioras 10)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "AGO" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "plenumigi AGOn je ĉiu kontrolpunkto" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "montri mesaÄon se ne ĉiuj ligoj estos Åutitaj" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "SIGNALO" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2170,35 +2199,35 @@ msgstr "" "estas: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 kaj SIGUSR2; la nomoj sen prefikso " "SIG ankaÅ­ akcepteblas" -#: src/tar.c:802 +#: src/tar.c:834 msgid "print file modification times in UTC" msgstr "montri dosierajn modif-horojn laŭ UTC" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "montri dosieran horon per Äia tuta distingivo" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "sendi detalan eligon al DOSIERO" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "montri bloknumeron ene de arÄ¥ivo je ĉiu mesaÄo" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "peti konfirmon por ĉiu ago" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "montri apriorojn de tar" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" -msgstr "" +msgstr "montri validajn intervalojn por kampoj de statkopi-dosiero" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2206,86 +2235,86 @@ msgstr "" "dum listigo aŭ eltiro, listigi ĉiun dosierujon kiu ne kongruas al serĉ-" "kriterio" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "montri dosieron aÅ­ arÄ¥ivajn nomojn post transformigo" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "STILO" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "difini nom-citigan stilon; vidu sube por validaj valoroj de STILO" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "krome citigi signojn el ĈENO" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "malebligi citigon por signoj el ĈENO" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "Akordigeblaj modifiloj:" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "dum kreo, same ol --old-archive; dum eltiro, same ol --no-same-owner" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "Aliaj modifiloj:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "malebligi uzon de kelkaj eble damaÄaj modifiloj" -#: src/tar.c:978 -#, fuzzy +#: src/tar.c:1010 msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" msgstr "" -"Vi ne devas indiki pli ol unu el la modifiloj '-Acdtrux' aŭ '--test-label'" +"Vi ne devas indiki pli ol unu el la modifiloj '-Acdtrux', '--delete' aŭ '--" +"test-label'" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Konfliktantaj densigaj modifiloj" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "Nekonata signal-nomo: %s" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "Data specimen-dosiero ne estis trovata" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Ni anstataÅ­igas %s por la nekonata dato-formo %s" -#: src/tar.c:1108 -#, fuzzy, c-format +#: src/tar.c:1140 +#, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "Modifilo %s: ni traktas daton '%s' kiel %s" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "filtri la arÄ¥ivon tra %s" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "Validaj argumentoj por la modifilo --quoting-style estas:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2293,48 +2322,47 @@ msgstr "" "\n" "*Tiu ĉi* tar apriorigas tion:\n" -#: src/tar.c:1295 -#, fuzzy +#: src/tar.c:1330 msgid "Invalid owner or group ID" -msgstr "Malvalida posedanto" +msgstr "Malvalida posedanto aÅ­ grupo-ID" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Malvalida blok-faktoro" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "Malvalida benda longo" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "Malvalida aldon-nivela valoro" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "Pli ol unu lim-dato" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "Malvalida disa versi-valoro" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' ne estas subtenata en tiu ĉi platformo" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "valoro de --checkpoint ne estas entjero" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Malvalida reÄimo indikita en modifilo" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "Malvalida numero" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" @@ -2342,149 +2370,138 @@ msgstr "" "La modifilo --preserve estas malrekomendinda, uzu --preserve-permissions --" "preserve-order anstataÅ­e" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Malvalida rikord-grando" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "Rikord-grando devas esti oblo de %d." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "Malvalida nombro da elementoj" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "Nur unu modifilo --to-command estas permesata" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "FuÅa densiga argumento: %s" -#: src/tar.c:2133 -#, fuzzy, c-format +#: src/tar.c:2205 +#, c-format msgid "Unknown density: '%c'" msgstr "Nekonata densigo: '%c'" -#: src/tar.c:2150 -#, fuzzy, c-format +#: src/tar.c:2222 +#, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "Modifiloj '-[0-7][lmh]' ne estas subtenata de *tiu ĉi* tar" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[DOSIERO]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 #, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "la modifilo --%s ne uzeblas kun %s" + +#: src/tar.c:2389 +#, c-format msgid "Old option '%c' requires an argument." msgstr "La malnova modifilo '%c' postulas argumenton." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "Sen dosierlisto, --occurrence estas sensignifa" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "--occurrence ne povas esti uzata en la petita operaci-reÄimo" - -#: src/tar.c:2408 -#, fuzzy +#: src/tar.c:2490 msgid "Multiple archive files require '-M' option" msgstr "Multoblaj arÄ¥iv-dosieroj postulas modifilon '-M'" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "Ne eblas kombini --listed-incremental kun --newer" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "Sen --listed-incremental, --level estas sensignifa" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "%s: volum-etikedo tro longas (limo estas %lu bajto)" msgstr[1] "%s: volum-etikedo tro longas (limo estas %lu bajtoj)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Ne eblas kontroli plur-volumajn arÄ¥ivojn" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Ne eblas kontroli densigitajn arÄ¥ivojn" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "Åœablono %s ne povas esti uzata" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Ne eblas uzi plur-volumajn densigitajn arÄ¥ivojn" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "Ne eblas kunmeti densigitajn arÄ¥ivojn" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option nur uzeblas en arÄ¥ivoj POSIX" -#: src/tar.c:2478 -#, fuzzy +#: src/tar.c:2560 msgid "--acls can be used only on POSIX archives" -msgstr "--pax-option nur uzeblas en arÄ¥ivoj POSIX" +msgstr "--acls nur uzeblas en arÄ¥ivoj POSIX" -#: src/tar.c:2483 -#, fuzzy +#: src/tar.c:2565 msgid "--selinux can be used only on POSIX archives" -msgstr "--pax-option nur uzeblas en arÄ¥ivoj POSIX" +msgstr "--selinux nur uzeblas en arÄ¥ivoj POSIX" -#: src/tar.c:2488 -#, fuzzy +#: src/tar.c:2570 msgid "--xattrs can be used only on POSIX archives" -msgstr "--pax-option nur uzeblas en arÄ¥ivoj POSIX" +msgstr "--xattrs nur uzeblas en arÄ¥ivoj POSIX" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "Åœablono %s ne povas esti uzata" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" +msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "Datum-voluma longo ne povas esti malpli ol rikord-grando" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "--preserve-order ne akordigeblas kun --listed-incremental" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "MalkuraÄe ni rifuzas krei malplenan arÄ¥ivon" -#: src/tar.c:2565 -#, fuzzy +#: src/tar.c:2669 msgid "Options '-Aru' are incompatible with '-f -'" msgstr "Modifiloj '-Aru' ne akordigeblas kun '-f -'" -#: src/tar.c:2660 -#, fuzzy +#: src/tar.c:2766 msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" -msgstr "Vi devas indiki unu el la modifiloj '-Acdtrux' aÅ­ '--test-label'" +msgstr "" +"Vi devas indiki unu el la modifiloj '-Acdtrux', --delete' aÅ­ '--test-label'" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "Ni eliras kun malsukcesa stato pro antaÅ­aj eraroj" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" @@ -2492,98 +2509,98 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: dosiero malkreskiÄis per %s bajto" msgstr[1] "%s: dosiero malkreskiÄis per %s bajtoj" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "Åœlosilo %s estas nekonata aÅ­ ankoraÅ­ ne realigita" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" msgstr "Temp-indiko estas for de permesata intervalo" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "Åœablono %s ne povas esti uzata" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Åœablono %s ne povas esti anstataÅ­igata" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "FuÅa etendita kapo: mankas longo" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "Longo de etendita kapo %*s estas for de intervalo" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "FuÅa etendita kapo: mankas blankspaco post longo" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "FuÅa etendita kapo: mankas egal-signo" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "FuÅa etendita kapo: mankas nov-linio" -#: src/xheader.c:740 -#, fuzzy, c-format +#: src/xheader.c:741 +#, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "Ni preteratentas nekonatan etenditan kapan Ålosilon '%s'" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "Generita paro Ålosilo/valoro tro longas (Ålosilo=%s, longo=%s)" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "La etendita kapo %s=%s estas for de la intervalo %s..%s" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "FuÅa etendita kapo: malvalida %s=%s" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "FuÅa etendita kapo: troiga %s=%s" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "FuÅa etendita kapo: malvalida %s: neatendita apartigilo %c" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "FuÅa etendita kapo: malvalida %s: malpara nombro da valoroj" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "%s: ne estas valida templimo" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "%s: nekonata kontrolpunkta ago" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "skribi" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "legi" @@ -2591,7 +2608,7 @@ msgstr "legi" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "Skriba kontrol-punkto %u" @@ -2600,7 +2617,7 @@ msgstr "Skriba kontrol-punkto %u" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "Lega kontrol-punkto %u" @@ -2814,14 +2831,14 @@ msgid "cannot set time on `%s'" msgstr "ne eblas difini horon por '%s'" #: tests/genfile.c:692 -#, fuzzy, c-format +#, c-format msgid "cannot truncate `%s'" -msgstr "ne eblas apliki 'unlink' al '%s'" +msgstr "ne eblas tranĉi '%s'" #: tests/genfile.c:701 -#, fuzzy, c-format +#, c-format msgid "command failed: %s" -msgstr "La komando %s fiaskis" +msgstr "komando fiaskis: %s" #: tests/genfile.c:706 #, c-format @@ -2863,20 +2880,32 @@ msgstr "Komando estas ĉesigita\n" msgid "--stat requires file names" msgstr "--stat postulas dosiernomojn" -#~ msgid "Cannot get working directory" -#~ msgstr "Ne eblas scii la laboran dosierujon" +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "--occurrence ne povas esti uzata kun %s" -#~ msgid "sort names to extract to match archive" -#~ msgstr "ordigi eltirotajn nomojn por kongrui al la arÄ¥ivo" +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "Ne eblas kombini --listed-incremental kun --newer" + +#~ msgid "--verify cannot be used with %s" +#~ msgstr "--verify ne povas esti uzata kun %s" + +#~ msgid "--preserve-order is not compatible with --listed-incremental" +#~ msgstr "--preserve-order ne akordigeblas kun --listed-incremental" #~ msgid "Field too long while reading snapshot file" -#~ msgstr "Kampo tro longa dum lego de specimena dosiero" +#~ msgstr "Kampo tro longa dum lego de stat-kopia dosiero" #~ msgid "Read error in snapshot file" -#~ msgstr "Leg-eraro en specimena dosiero" +#~ msgstr "Leg-eraro en statkopia dosiero" #~ msgid "Unexpected field value in snapshot file" -#~ msgstr "Neatendita kamp-valoro en specimena dosiero" +#~ msgstr "Neatendita kamp-valoro en statkopia dosiero" + +#~ msgid "Cannot get working directory" +#~ msgstr "Ne eblas scii la laboran dosierujon" + +#~ msgid "sort names to extract to match archive" +#~ msgstr "ordigi eltirotajn nomojn por kongrui al la arÄ¥ivo" #~ msgid "Invalid group" #~ msgstr "Malvalida grupo" diff --git a/po/es.gmo b/po/es.gmo index db119d7..edfee85 100644 Binary files a/po/es.gmo and b/po/es.gmo differ diff --git a/po/es.po b/po/es.po index 837eef9..ea52c99 100644 --- a/po/es.po +++ b/po/es.po @@ -1,28 +1,29 @@ -# Mensajes en español para GNU tar. +# Mensajes en español para GNU tar. # Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc. +# This file is distributed under the same license as the tar package. # Federico Rivas , 1997. # Enrique Melero , 1997. -# Santiago Vila Doncel , 1998, 1999, 2000, 2001, 2002, 2004. +# Santiago Vila Doncel , 1998, 1999, 2000, 2001, 2002, 2004, 2014. # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" -"Project-Id-Version: GNU tar 1.15.1\n" +"Project-Id-Version: GNU tar 1.27\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" -"PO-Revision-Date: 2004-12-27 20:45+0100\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" +"PO-Revision-Date: 2014-07-15 19:39+0200\n" "Last-Translator: Santiago Vila Doncel \n" -"Language-Team: Spanish \n" +"Language-Team: Spanish \n" "Language: es\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: gnu/argmatch.c:135 #, c-format msgid "invalid argument %s for %s" -msgstr "argumento %s inválido para %s" +msgstr "argumento %s inválido para %s" #: gnu/argmatch.c:136 #, c-format @@ -31,27 +32,27 @@ msgstr "argumento %s ambiguo para %s" #: gnu/argmatch.c:155 msgid "Valid arguments are:" -msgstr "Los argumentos válidos son:" +msgstr "Los argumentos válidos son:" #: gnu/argp-help.c:150 #, c-format msgid "ARGP_HELP_FMT: %s value is less than or equal to %s" -msgstr "" +msgstr "ARGP_HELP_FMT: el valor de %s es menor o igual que %s" #: gnu/argp-help.c:223 #, c-format msgid "%.*s: ARGP_HELP_FMT parameter requires a value" -msgstr "%.*s: El parámetro ARGP_HELP_FMT necesita un valor" +msgstr "%.*s: El parámetro ARGP_HELP_FMT necesita un valor" #: gnu/argp-help.c:229 -#, fuzzy, c-format +#, c-format msgid "%.*s: ARGP_HELP_FMT parameter must be positive" -msgstr "%.*s: El parámetro ARGP_HELP_FMT necesita un valor" +msgstr "%.*s: El parámetro ARGP_HELP_FMT debe ser positivo" #: gnu/argp-help.c:238 #, c-format msgid "%.*s: Unknown ARGP_HELP_FMT parameter" -msgstr "%.*s: Parámetro ARGP_HELP_FMT desconocido" +msgstr "%.*s: Parámetro ARGP_HELP_FMT desconocido" #: gnu/argp-help.c:250 #, c-format @@ -64,7 +65,7 @@ msgid "" "optional for any corresponding short options." msgstr "" "Los argumentos obligatorios u opcionales para las opciones largas son " -"también\n" +"también\n" "obligatorios u opcionales para las opciones cortas correspondientes." #: gnu/argp-help.c:1643 @@ -77,155 +78,142 @@ msgstr " o bien: " #: gnu/argp-help.c:1659 msgid " [OPTION...]" -msgstr " [OPCIÓN...]" +msgstr " [OPCIÓN...]" #: gnu/argp-help.c:1686 -#, fuzzy, c-format +#, c-format msgid "Try '%s --help' or '%s --usage' for more information.\n" -msgstr "Pruebe `%s --help' o `%s --usage' para más información.\n" - -# Por favor, no me digáis cómo se traduce bug. -# Gerardo lo ha visto traducido en un libro como "pulgas", y yo -# lo he visto como "chinche" en la "Investigación y Ciencia". -# Está claro que así no vamos a ninguna parte. -# Yo diría simplemente `fallos [ocultos]'. Es lo que significa, en realidad, -# en el contexto informático, razones históricas aparte de bichos anidando -# al calorcito de los tubos de vacío de los primeros computadores. gerardo -# De "ocultos" nada... Este vamos a dejarlo, ¿vale? sv -# Tú mandas, pero ¿cómo que de ocultos nada? Si no fueran ocultos, el progra- -# ma no vería la luz aún, ¿no? Pero observa que he puesto el `ocultos' entre -# corchetes. Yo pondría "bug -> fallo" simplemente. Comunicar fallos a... gerardo -# ¿Que no vería la luz si no fueran ocultos? Ja, ja, ja, ja... -# Mira por ejemplo en http://nl.debian.org/Bugs. -# ¿No tendría sentido catalogarlos entonces? +msgstr "Pruebe '%s --help' o '%s --usage' para más información.\n" + +# "We could, for instance, begin with cleaning up our language by no +# longer calling a bug a bug but by calling it an error." # -# Véase "A Bug's life". +# Edsger W. Dijkstra, "On the cruelty of really teaching computing science" +# +# http://www.cs.utexas.edu/users/EWD/transcriptions/EWD10xx/EWD1036.html #: gnu/argp-help.c:1714 #, c-format msgid "Report bugs to %s.\n" -msgstr "Comunicar bichos a %s.\n" +msgstr "Comunicar errores a %s.\n" #: gnu/argp-help.c:1933 gnu/error.c:190 msgid "Unknown system error" msgstr "Error del sistema desconocido" #: gnu/argp-parse.c:83 -#, fuzzy msgid "give this help list" -msgstr "Da esta lista de ayuda" +msgstr "da esta lista de ayuda" #: gnu/argp-parse.c:84 -#, fuzzy msgid "give a short usage message" -msgstr "Da un mensaje de uso corto" +msgstr "da un mensaje de uso corto" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "NOMBRE" #: gnu/argp-parse.c:85 msgid "set the program name" -msgstr "" +msgstr "establece el nombre del programa" #: gnu/argp-parse.c:86 msgid "SECS" -msgstr "" +msgstr "SEGS" #: gnu/argp-parse.c:87 msgid "hang for SECS seconds (default 3600)" -msgstr "" +msgstr "cuelga durante SEGS segundos (por omisión 3600)" #: gnu/argp-parse.c:144 -#, fuzzy msgid "print program version" -msgstr "Muestra la versión del programa" +msgstr "muestra la versión del programa" #: gnu/argp-parse.c:161 msgid "(PROGRAM ERROR) No version known!?" -msgstr "" +msgstr "(ERROR DEL PROGRAMA) ¿¡No se sabe cuál es la versión!?" #: gnu/argp-parse.c:614 -#, fuzzy, c-format +#, c-format msgid "%s: Too many arguments\n" -msgstr "%s: la opción `%s' requiere un argumento\n" +msgstr "%s: Demasiados argumentos\n" #: gnu/argp-parse.c:757 msgid "(PROGRAM ERROR) Option should have been recognized!?" -msgstr "" +msgstr "(ERROR DEL PROGRAMA) ¿¡No se debería haber reconocido la opción!?" #: gnu/closeout.c:114 msgid "write error" -msgstr "" +msgstr "error de escritura" #: gnu/getopt.c:549 gnu/getopt.c:578 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: la opción `%s' es ambigua\n" +msgstr "%s: la opción '%s' es ambigua; posibilidades:" #: gnu/getopt.c:626 gnu/getopt.c:630 -#, fuzzy, c-format +#, c-format msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: la opción `--%s' no admite ningún argumento\n" +msgstr "%s: la opción '--%s' no admite ningún argumento\n" #: gnu/getopt.c:639 gnu/getopt.c:644 -#, fuzzy, c-format +#, 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" +msgstr "%s: la opción '%c%s' no admite ningún argumento\n" #: gnu/getopt.c:687 gnu/getopt.c:706 -#, fuzzy, c-format +#, c-format msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: la opción `%s' requiere un argumento\n" +msgstr "%s: la opción '--%s' requiere un argumento\n" #: gnu/getopt.c:744 gnu/getopt.c:747 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: opción no reconocida `--%s'\n" +msgstr "%s: opción no reconocida '--%s'\n" #: gnu/getopt.c:755 gnu/getopt.c:758 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: opción no reconocida `%c%s'\n" +msgstr "%s: opción no reconocida '%c%s'\n" #: gnu/getopt.c:807 gnu/getopt.c:810 -#, fuzzy, c-format +#, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "%s: opción inválida -- %c\n" +msgstr "%s: opción inválida -- '%c'\n" #: gnu/getopt.c:863 gnu/getopt.c:880 gnu/getopt.c:1090 gnu/getopt.c:1108 -#, fuzzy, c-format +#, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s: la opción requiere un argumento -- %c\n" +msgstr "%s: la opción requiere un argumento -- '%c'\n" #: gnu/getopt.c:936 gnu/getopt.c:952 -#, fuzzy, c-format +#, c-format msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: la opción `-W %s' es ambigua\n" +msgstr "%s: la opción '-W %s' es ambigua\n" #: gnu/getopt.c:976 gnu/getopt.c:994 -#, fuzzy, c-format +#, 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" +msgstr "%s: la opción '-W %s' no admite ningún argumento\n" #: gnu/getopt.c:1015 gnu/getopt.c:1033 -#, fuzzy, c-format +#, c-format msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: la opción `%s' requiere un argumento\n" +msgstr "%s: la opción '-W %s' requiere un argumento\n" #: gnu/obstack.c:415 gnu/obstack.c:417 gnu/xalloc-die.c:36 msgid "memory exhausted" msgstr "memoria agotada" #: gnu/openat-die.c:40 -#, fuzzy, c-format +#, c-format msgid "unable to record current working directory" -msgstr "No se pudo obtener el directorio actual" +msgstr "no se puede obtener el directorio de trabajo actual" #: gnu/openat-die.c:59 -#, fuzzy, c-format +#, c-format msgid "failed to return to initial working directory" -msgstr "No se puede determinar el directorio de trabajo inicial" +msgstr "fallo al volver al directorio de trabajo inicial" #. TRANSLATORS: #. Get translations for open and closing quotation marks. @@ -250,11 +238,11 @@ msgstr "No se puede determinar el directorio de trabajo inicial" #. and use glyphs suitable for your language. #: gnu/quotearg.c:314 msgid "`" -msgstr "`" +msgstr "«" #: gnu/quotearg.c:315 msgid "'" -msgstr "'" +msgstr "»" #. TRANSLATORS: A regular expression testing for an affirmative answer #. (english: "yes"). Testing the first character may be sufficient. @@ -264,7 +252,7 @@ msgstr "'" #. locale -k LC_MESSAGES | grep '^yesexpr=' #: gnu/rpmatch.c:152 msgid "^[yY]" -msgstr "" +msgstr "^[sSyY]" #. TRANSLATORS: A regular expression testing for a negative answer #. (english: "no"). Testing the first character may be sufficient. @@ -274,24 +262,24 @@ msgstr "" #. locale -k LC_MESSAGES | grep '^noexpr=' #: gnu/rpmatch.c:165 msgid "^[nN]" -msgstr "" +msgstr "^[nN]" #: gnu/version-etc.c:76 #, c-format msgid "Packaged by %s (%s)\n" -msgstr "" +msgstr "Empaquetado por %s (%s)\n" #: gnu/version-etc.c:79 #, c-format msgid "Packaged by %s\n" -msgstr "" +msgstr "Empaquetado por %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. #: gnu/version-etc.c:86 msgid "(C)" -msgstr "" +msgstr "©" #: gnu/version-etc.c:88 msgid "" @@ -302,24 +290,30 @@ msgid "" "There is NO WARRANTY, to the extent permitted by law.\n" "\n" msgstr "" +"\n" +"License GPLv3+: GPL de GNU versión 3 o posterior \n" +"Esto es software libre: usted es libre de cambiarlo y redistribuirlo.\n" +"No hay NINGUNA GARANTÃA, hasta donde permite la ley.\n" +"\n" #. TRANSLATORS: %s denotes an author name. #: gnu/version-etc.c:104 -#, fuzzy, c-format +#, c-format msgid "Written by %s.\n" -msgstr "Escrito por François Pinard." +msgstr "Escrito por %s.\n" #. TRANSLATORS: Each %s denotes an author name. #: gnu/version-etc.c:108 -#, fuzzy, c-format +#, c-format msgid "Written by %s and %s.\n" -msgstr "Escrito por François Pinard." +msgstr "Escrito por %s y %s.\n" #. TRANSLATORS: Each %s denotes an author name. #: gnu/version-etc.c:112 -#, fuzzy, c-format +#, c-format msgid "Written by %s, %s, and %s.\n" -msgstr "Escrito por François Pinard." +msgstr "Escrito por %s, %s y %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -330,6 +324,8 @@ msgid "" "Written by %s, %s, %s,\n" "and %s.\n" msgstr "" +"Escrito por %s, %s, %s,\n" +"y %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -340,6 +336,8 @@ msgid "" "Written by %s, %s, %s,\n" "%s, and %s.\n" msgstr "" +"Escrito por %s, %s, %s,\n" +"%s, y %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -350,6 +348,8 @@ msgid "" "Written by %s, %s, %s,\n" "%s, %s, and %s.\n" msgstr "" +"Escrito por %s, %s, %s,\n" +"%s, %s, y %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -360,6 +360,8 @@ msgid "" "Written by %s, %s, %s,\n" "%s, %s, %s, and %s.\n" msgstr "" +"Escrito por %s, %s, %s,\n" +"%s, %s, %s, y %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -371,6 +373,9 @@ msgid "" "%s, %s, %s, %s,\n" "and %s.\n" msgstr "" +"Escrito por %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"y %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -382,6 +387,9 @@ msgid "" "%s, %s, %s, %s,\n" "%s, and %s.\n" msgstr "" +"Escrito por %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s, y %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -393,140 +401,113 @@ msgid "" "%s, %s, %s, %s,\n" "%s, %s, and others.\n" msgstr "" +"Escrito por %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s, %s, y otros.\n" -# Por favor, no me digáis cómo se traduce bug. -# Gerardo lo ha visto traducido en un libro como "pulgas", y yo -# lo he visto como "chinche" en la "Investigación y Ciencia". -# Está claro que así no vamos a ninguna parte. -# Yo diría simplemente `fallos [ocultos]'. Es lo que significa, en realidad, -# en el contexto informático, razones históricas aparte de bichos anidando -# al calorcito de los tubos de vacío de los primeros computadores. gerardo -# De "ocultos" nada... Este vamos a dejarlo, ¿vale? sv -# Tú mandas, pero ¿cómo que de ocultos nada? Si no fueran ocultos, el progra- -# ma no vería la luz aún, ¿no? Pero observa que he puesto el `ocultos' entre -# corchetes. Yo pondría "bug -> fallo" simplemente. Comunicar fallos a... gerardo -# ¿Que no vería la luz si no fueran ocultos? Ja, ja, ja, ja... -# Mira por ejemplo en http://nl.debian.org/Bugs. -# ¿No tendría sentido catalogarlos entonces? -# -# Véase "A Bug's life". #. 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). #: gnu/version-etc.c:247 -#, fuzzy, c-format +#, c-format msgid "" "\n" "Report bugs to: %s\n" -msgstr "Comunicar bichos a %s.\n" - -# Por favor, no me digáis cómo se traduce bug. -# Gerardo lo ha visto traducido en un libro como "pulgas", y yo -# lo he visto como "chinche" en la "Investigación y Ciencia". -# Está claro que así no vamos a ninguna parte. -# Yo diría simplemente `fallos [ocultos]'. Es lo que significa, en realidad, -# en el contexto informático, razones históricas aparte de bichos anidando -# al calorcito de los tubos de vacío de los primeros computadores. gerardo -# De "ocultos" nada... Este vamos a dejarlo, ¿vale? sv -# Tú mandas, pero ¿cómo que de ocultos nada? Si no fueran ocultos, el progra- -# ma no vería la luz aún, ¿no? Pero observa que he puesto el `ocultos' entre -# corchetes. Yo pondría "bug -> fallo" simplemente. Comunicar fallos a... gerardo -# ¿Que no vería la luz si no fueran ocultos? Ja, ja, ja, ja... -# Mira por ejemplo en http://nl.debian.org/Bugs. -# ¿No tendría sentido catalogarlos entonces? -# -# Véase "A Bug's life". -#: gnu/version-etc.c:249 -#, fuzzy, c-format -msgid "Report %s bugs to: %s\n" msgstr "" "\n" -"Comunicar bichos a <%s>.\n" +"Comunicar errores a: %s\n" + +#: gnu/version-etc.c:249 +#, c-format +msgid "Report %s bugs to: %s\n" +msgstr "Comunicar errores en %s a: %s\n" #: gnu/version-etc.c:253 #, c-format msgid "%s home page: <%s>\n" -msgstr "" +msgstr "Página de %s: <%s>\n" #: gnu/version-etc.c:255 #, c-format msgid "%s home page: \n" -msgstr "" +msgstr "Página de %s: \n" #: gnu/version-etc.c:258 msgid "General help using GNU software: \n" msgstr "" +"Ayuda general sobre el uso de software de GNU: \n" # FIXME: Intraducible. #. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'. #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" -msgstr "%s: No se puede %s" +msgstr "%s: No se puede efectuar %s" #. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'. #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" -msgstr "%s: Atención: No se puede %s" +msgstr "%s: Atención: No se puede efectuar %s" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: No se puede cambiar el modo a %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: No se puede cambiar el propietario a uid %lu, gid %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: No se puede crear un enlace duro a %s" -#: lib/paxerror.c:179 lib/paxerror.c:211 -#, fuzzy, c-format +#: lib/paxerror.c:181 lib/paxerror.c:213 +#, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" -msgstr[0] "%s: Error de lectura en el byte %s, leyendo %lu byte" -msgstr[1] "%s: Error de lectura en el byte %s, leyendo %lu bytes" +msgstr[0] "%s: Error de lectura en el byte %s, al leer %lu byte" +msgstr[1] "%s: Error de lectura en el byte %s, al leer %lu bytes" -#: lib/paxerror.c:192 -#, fuzzy, c-format +#: lib/paxerror.c:194 +#, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" -msgstr[0] "%s: Atención: Error de lectura en el byte %s, leyendo %lu byte" -msgstr[1] "%s: Atención: Error de lectura en el byte %s, leyendo %lu bytes" +msgstr[0] "%s: Atención: Error de lectura en el byte %s, al leer %lu byte" +msgstr[1] "%s: Atención: Error de lectura en el byte %s, al leer %lu bytes" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: No se puede desplazar a %s" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" -msgstr "%s: Atención: No se puede desplazar a %s" +msgstr "%s: Atención: No se puede desplazar a %s" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" -msgstr "%s: No se puede crear el enlace simbólico a %s" +msgstr "%s: No se puede crear el enlace simbólico a %s" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" -msgstr[0] "%s: Sólo se escribieron %lu de %lu byte" -msgstr[1] "%s: Sólo se escribieron %lu de %lu bytes" +msgstr[0] "%s: Sólo se escribieron %lu de %lu byte" +msgstr[1] "%s: Sólo se escribieron %lu de %lu bytes" # FIXME. This might not always work. Is `%.*s' male or female? sv #: lib/paxnames.c:140 @@ -542,11 +523,11 @@ msgstr "Eliminando la `%s' inicial de los objetivos de los enlaces" # FIXME. This might not always work. Is `%.*s' male or female? sv #: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" -msgstr "Se sustituye `.' por el nombre vacío" +msgstr "Se sustituye `.' por el nombre vacío" #: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" -msgstr "Se sustituye `.' por un objetivo vacío de enlace duro" +msgstr "Se sustituye `.' por un objetivo vacío de enlace duro" #: lib/rtapelib.c:299 #, c-format @@ -556,25 +537,25 @@ msgstr "exec/tcp: Servicio no disponible" #: lib/rtapelib.c:303 #, c-format msgid "stdin" -msgstr "entrada estándar (stdin)" +msgstr "entrada estándar (stdin)" #: lib/rtapelib.c:306 #, c-format msgid "stdout" -msgstr "salida estándar (stdout)" +msgstr "salida estándar (stdout)" # Lo mismo que con stat() em+ -# seek() es otra función. seek = "hacer seek()" ¡Estos +# seek() es otra función. seek = "hacer seek()" ¡Estos # angloparlantes! #: lib/rtapelib.c:429 -#, fuzzy, c-format +#, c-format msgid "Cannot connect to %s: resolve failed" -msgstr "No se puede acceder a la posición %s en el fichero %s" +msgstr "No se puede conectar a %s: falló la resolución" #: lib/rtapelib.c:502 -#, fuzzy, c-format +#, c-format msgid "Cannot redirect files for remote shell" -msgstr "No se puede ejecutar un shell remoto" +msgstr "No se pueden redireccionar los ficheros para un shell remoto" #: lib/rtapelib.c:516 #, c-format @@ -583,17 +564,15 @@ msgstr "No se puede ejecutar un shell remoto" #: rmt/rmt.c:432 msgid "Seek direction out of range" -msgstr "Dirección de desplazamiento fuera de rango" +msgstr "Dirección de desplazamiento fuera de rango" #: rmt/rmt.c:438 -#, fuzzy msgid "Invalid seek direction" -msgstr "Se ha especificado un modo no válido en la opción" +msgstr "Orden de desplazamiento inválida" #: rmt/rmt.c:446 -#, fuzzy msgid "Invalid seek offset" -msgstr "Marca de tiempo inválida" +msgstr "Desplazamiento inválido" #: rmt/rmt.c:452 msgid "Seek offset out of range" @@ -602,239 +581,245 @@ msgstr "Desplazamiento fuera de rango" #: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608 #, fuzzy msgid "Invalid byte count" -msgstr "Longitud de cinta inválida" +msgstr "Longitud de cinta inválida" #: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625 #, fuzzy msgid "Byte count out of range" msgstr "Desplazamiento fuera de rango" -# FIXME. Este es el único eof en minúsculas. +# FIXME. Este es el único eof en minúsculas. #: rmt/rmt.c:558 -#, fuzzy msgid "Premature eof" -msgstr "rmtd: Fin de fichero prematuro\n" +msgstr "Fin de fichero prematuro" #: rmt/rmt.c:601 -#, fuzzy msgid "Invalid operation code" -msgstr "Modo principal de operación:" +msgstr "Código de operación inválido" #: rmt/rmt.c:636 rmt/rmt.c:680 msgid "Operation not supported" -msgstr "" +msgstr "Operación no soportada" +# ¿No se referirá al autor a "mangled filenames"?... jmg +# FIXME. Preguntárselo. #: rmt/rmt.c:664 -#, fuzzy msgid "Unexpected arguments" -msgstr "Fin de fichero inesperado en el archivo" +msgstr "Argumentos inesperados" #: rmt/rmt.c:689 msgid "Manipulate a tape drive, accepting commands from a remote process" -msgstr "" +msgstr "Maneja una unidad de cinta, aceptando órdenes de un proceso remoto" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" -msgstr "NÚMERO" +msgstr "NÚMERO" #: rmt/rmt.c:697 msgid "set debug level" -msgstr "" +msgstr "establece el nivel de depuración" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "FICHERO" #: rmt/rmt.c:699 msgid "set debug output file name" -msgstr "" +msgstr "establece el nombre del fichero para la salida de depuración" #: rmt/rmt.c:715 rmt/rmt.c:783 -#, fuzzy, c-format +#, c-format msgid "cannot open %s" msgstr "No se puede abrir %s" #: rmt/rmt.c:780 tests/genfile.c:892 tests/genfile.c:909 #, c-format msgid "too many arguments" -msgstr "" +msgstr "demasiados argumentos" #: rmt/rmt.c:822 msgid "Garbage command" msgstr "Orden ininteligible" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Esto no parece un archivo tar" -# ¿No es mejor "Total de bytes escritos: "? -# Suena más directo y más similar al original, -# "bytes escritos en total" suena demasiado complejo... Nicolás Lichtmaier. -# Suena algo extraño eso de "total de bytes". "en total" me suena -# mucho más natural. sv -#: src/buffer.c:521 src/buffer.c:530 -#, fuzzy -msgid "Total bytes written" -msgstr "Bytes escritos en total: %s (%s, %s/s)\n" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" -msgstr "" +msgstr "Bytes leídos en total" + +# ¿No es mejor "Total de bytes escritos: "? +# Suena más directo y más similar al original, +# "bytes escritos en total" suena demasiado complejo... Nicolás Lichtmaier. +# Suena algo extraño eso de "total de bytes". "en total" me suena +# mucho más natural. sv +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "Bytes escritos en total" -# ¿No es mejor "Total de bytes escritos: "? -# Suena más directo y más similar al original, -# "bytes escritos en total" suena demasiado complejo... Nicolás Lichtmaier. -# Suena algo extraño eso de "total de bytes". "en total" me suena -# mucho más natural. sv -#: src/buffer.c:532 -#, fuzzy, c-format -msgid "Total bytes deleted: %s\n" -msgstr "Bytes escritos en total: %s (%s, %s/s)\n" +# ¿No es mejor "Total de bytes escritos: "? +# Suena más directo y más similar al original, +# "bytes escritos en total" suena demasiado complejo... Nicolás Lichtmaier. +# Suena algo extraño eso de "total de bytes". "en total" me suena +# mucho más natural. sv +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" +msgstr "Bytes borrados en total: %s\n" # Antes de que nadie diga nada: # -# Si a alguien no le gusta la palabra tubería (que aparece en algunos +# Si a alguien no le gusta la palabra tubería (que aparece en algunos # libros sobre MS-DOS y es la que venimos usando desde el principio) que -# haga una propuesta seria de cambio, pero que sepa que abriríamos la caja -# de Pandora, pues hay muchas palabras posibles para pipe: tubería, -# conducto, cañería, canal, etc. +# haga una propuesta seria de cambio, pero que sepa que abriríamos la caja +# de Pandora, pues hay muchas palabras posibles para pipe: tubería, +# conducto, cañería, canal, etc. # -# En cuanto a poner (pipe) entre paréntesis, es una mala costumbre que -# deberíamos desterrar ya. Eso se hace en los libros la primera vez, pero -# aquí no sólo no hay primera vez, sino que el mismo mensaje puede -# aparecer *varias* veces, y entonces sí que es una paliza. -# Ejemplo de paliza: "tubería rota" en libc. Sale muchísimo y no es -# cuestión de ver (pipe) cuarenta veces al día... -#: src/buffer.c:621 +# En cuanto a poner (pipe) entre paréntesis, es una mala costumbre que +# deberíamos desterrar ya. Eso se hace en los libros la primera vez, pero +# aquí no sólo no hay primera vez, sino que el mismo mensaje puede +# aparecer *varias* veces, y entonces sí que es una paliza. +# Ejemplo de paliza: "tubería rota" en libc. Sale muchísimo y no es +# cuestión de ver (pipe) cuarenta veces al día... +#: src/buffer.c:656 msgid "(pipe)" -msgstr "(tubería)" +msgstr "(tubería)" + +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" -# ¿No queda más bonita la 1ª comilla abierta así: `record_size'? -# Sí. FIXME. Comunicar al autor. sv -#: src/buffer.c:644 +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +# ¿No queda más bonita la 1ª comilla abierta así: `record_size'? +# Sí. FIXME. Comunicar al autor. sv +#: src/buffer.c:695 msgid "Invalid value for record_size" -msgstr "El valor de `record_size' no es válido" +msgstr "El valor de `record_size' no es válido" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" -msgstr "No se ha especificado ningún nombre de archivo" +msgstr "No se ha especificado ningún nombre de archivo" -# FIXME: Si la entrada/salida estándar no es un archivo, ¿por qué el +# FIXME: Si la entrada/salida estándar no es un archivo, ¿por qué el # original se refiere a ella como tal? # -# En cierto sentido, sí es un archivo, o se puede emplear como tal. -# Tar al menos la trata así, en `tar -f -' (o sin la opción -f en este +# En cierto sentido, sí es un archivo, o se puede emplear como tal. +# Tar al menos la trata así, en `tar -f -' (o sin la opción -f en este # GNU tar)'; luego la E/S std. puede ser un archivo "real" de disco: # tar ... -f - > arch.tar gerardo # -# Esto corresponde a la opción --verify. +# Esto corresponde a la opción --verify. # Ejemplos: "tar cWf - ." y "tar xWf -" -# o sea que una traducción correcta se vería más como: -# "No se puede verificar un archivo desde/hacia la entrada/salida estándar" -# o algo así. Quizá "No se puede verificar un archivo tomado de la entrada -# estándar o escrito hacia la salida estándar", pero es un poco largo.. =) +# o sea que una traducción correcta se vería más como: +# "No se puede verificar un archivo desde/hacia la entrada/salida estándar" +# o algo así. Quizá "No se puede verificar un archivo tomado de la entrada +# estándar o escrito hacia la salida estándar", pero es un poco largo.. =) # -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" -msgstr "No se puede verificar la entrada/salida estándar" +msgstr "No se puede verificar la entrada/salida estándar" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" -msgstr "El archivo está comprimido. Utilice la opción %s" +msgstr "El archivo está comprimido. Utilice la opción %s" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "No se pueden actualizar archivos comprimidos" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" -msgstr "Al principio de la cinta, se terminará ahora" +msgstr "Al principio de la cinta, se terminará ahora" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "Demasiados errores, abandono" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" -msgstr[0] "Tamaño del registro = %lu bloque" -msgstr[1] "Tamaño del registro = %lu bloques" +msgstr[0] "Tamaño del registro = %lu bloque" +msgstr[1] "Tamaño del registro = %lu bloques" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "Bloque no alineado (%lu byte) dentro del archivo" msgstr[1] "Bloque no alineado (%lu bytes) dentro del archivo" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" -msgstr "No se puede ir hacia atrás en el archivo; puede ser ilegible sin -i" +msgstr "No se puede ir hacia atrás en el archivo; puede ser ilegible sin -i" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" -msgstr "rmtlseek no paró en los límites de un registro" +msgstr "rmtlseek no paró en los límites de un registro" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" -msgstr "%s: contiene un número de volumen inválido" +msgstr "%s: contiene un número de volumen inválido" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" -msgstr "Desbordamiento en el número de volumen" +msgstr "Desbordamiento en el número de volumen" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Prepare el volumen #%d para %s y pulse intro: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "" -"Se encontró un final de fichero mientras se esperaba respuesta del usuario" +"Se encontró un final de fichero mientras se esperaba respuesta del usuario" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" -msgstr "ATENCIÓN: El archivo está incompleto" +msgstr "ATENCIÓN: El archivo está incompleto" # Antes de que nadie diga nada: -# shell admite muchas traducciones, caparazón, concha, envoltorio, coraza, -# etc. pero ninguna ha prosperado. Además, algunos nombres son innombrables -# en ciertos países, así que mejor dejarlo como está. +# shell admite muchas traducciones, caparazón, concha, envoltorio, coraza, +# etc. pero ninguna ha prosperado. Además, algunos nombres son innombrables +# en ciertos países, así que mejor dejarlo como está. # Y si no se traduce, se queda en *el* shell, es decir, *neutro*. # -# Ya que volúmenes se acentúa, ¿habría que poner "volumen/volúmenes" +# Ya que volúmenes se acentúa, ¿habría que poner "volumen/volúmenes" # en lugar de "volumen(es)"? -# No me gusta, ya que sólo es plural con la parte entre paréntesis "(y consecutivos)". fr -# Creo que esta bien así Gerardo. em+ -# # Cuidadín. ¿El nombre de archivo se le da *al* volumen? Literalmente -# # dice que da un nuevo nombre *para* el sgute. volumen, pero ¿ese -# # nombre es el del volumen? No entiendo bien el contexto; quizá -# # habría que mirar el código fuente o ver cuándo sale este +# No me gusta, ya que sólo es plural con la parte entre paréntesis "(y consecutivos)". fr +# Creo que esta bien así Gerardo. em+ +# # Cuidadín. ¿El nombre de archivo se le da *al* volumen? Literalmente +# # dice que da un nuevo nombre *para* el sgute. volumen, pero ¿ese +# # nombre es el del volumen? No entiendo bien el contexto; quizá +# # habría que mirar el código fuente o ver cuándo sale este # # mensaje. -# # Otra cosa es eso de "abortar". No sé si se habrá tratado en -# # spanglish o en es@li.org, pero suena muy feo, ¿no? Quizá "Sale +# # Otra cosa es eso de "abortar". No sé si se habrá tratado en +# # spanglish o en es@li.org, pero suena muy feo, ¿no? Quizá "Sale # # inmediatamente de tar". # # "Print this list" es exactamente "Imprime esta lista" o a lo sumo "Muestra # esta lista". No veo que diga ayuda en ninguna parte, no creo que un -# traductor deba ser más inteligente que el escritor original.. =) nl -# Yo creo que a veces sí :-) sv -# Sí, un programador no tiene por qué ser buen escritor :-) En un fortune me -# salió una vez: "Los que no saben escribir, escriben manuales". :-) -# A mí aquí me da igual lista que ayuda, de las dos formas se entiende. Manda +# traductor deba ser más inteligente que el escritor original.. =) nl +# Yo creo que a veces sí :-) sv +# Sí, un programador no tiene por qué ser buen escritor :-) En un fortune me +# salió una vez: "Los que no saben escribir, escriben manuales". :-) +# A mí aquí me da igual lista que ayuda, de las dos formas se entiende. Manda # el traductor original. gerardo -# ¿A alguien más le parece mal que ponga ayuda en vez de lista? sv -#: src/buffer.c:1149 +# ¿A alguien más le parece mal que ponga ayuda en vez de lista? sv +#: src/buffer.c:1200 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -847,133 +832,132 @@ msgstr "" " ! Lanza un subshell\n" " ? Muestra esta ayuda\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" -msgstr "" +msgstr " ! Lanza un subshell\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" -msgstr "" +msgstr " ? Muestra esta lista\n" # "saliendo"->"finalizando". jmg -# Je, je, ¿no has leído, Santiago, el `dardo' de Fdo. Lázaro Carreter sobre -# finalizar? No sé por qué quitar lo de salir, to exit es salir, no acabar. -# Uno se sale del programa, y éste acaba. En realidad, también da igual, de +# Je, je, ¿no has leído, Santiago, el `dardo' de Fdo. Lázaro Carreter sobre +# finalizar? No sé por qué quitar lo de salir, to exit es salir, no acabar. +# Uno se sale del programa, y éste acaba. En realidad, también da igual, de # cualquier forma se entiende, pero mejor acabar o terminar que finalizar, -# total, son sinónimos. gerardo -#: src/buffer.c:1162 +# total, son sinónimos. gerardo +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "No hay volumen nuevo; finalizando.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" -msgstr "" +msgstr "No se ha especificado el nombre del fichero. Inténtelo de nuevo.\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" -msgstr "" +msgstr "Entrada inválida. Teclee ? para obtener ayuda.\n" -#: src/buffer.c:1259 -#, fuzzy, c-format +#: src/buffer.c:1310 +#, c-format msgid "%s command failed" -msgstr "La orden `%s' falló" +msgstr "La orden %s falló" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, fuzzy, c-format msgid "%s is possibly continued on this volume: header contains truncated name" -msgstr "%s no continúa en este volumen" +msgstr "%s no continúa en este volumen" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" -msgstr "%s no continúa en este volumen" +msgstr "%s no continúa en este volumen" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" -msgstr "%s tiene un tamaño erróneo (%s != %s + %s)" +msgstr "%s tiene un tamaño erróneo (%s != %s + %s)" -# Sugerencia: está fuera de secuencia -> no está en orden. sv -# Creo recordar que en el CPBackup de Central Point ponía lo de "fuera de +# Sugerencia: está fuera de secuencia -> no está en orden. sv +# Creo recordar que en el CPBackup de Central Point ponía lo de "fuera de # secuencia". fr # Buena referencia :-). -# El comentario habrá que conservarlo en la versión final. sv +# El comentario habrá que conservarlo en la versión final. sv # Bueno, la verdad es que ahora que lo pienso, me parece una mala -# traducción... ¿opiniones? sv -# Me parece correcta la traducción "literal", pero me gusta -# más tu sugerencia - gerardo +# traducción... ¿opiniones? sv +# Me parece correcta la traducción "literal", pero me gusta +# más tu sugerencia - gerardo # El problema es que un volumen individual no puede estar desordenado. -# Lo que está ordenado o no es la sucesión entera. +# Lo que está ordenado o no es la sucesión entera. # Un volumen individual puede estar fuera de lugar, pero no desordenado -# él solito. -# Todavía espero una solución mágica que sea mejor que las dos +# él solito. +# Todavía espero una solución mágica que sea mejor que las dos # que tenemos hasta ahora. -#: src/buffer.c:1473 -#, fuzzy, c-format +#: src/buffer.c:1524 +#, c-format msgid "This volume is out of sequence (%s - %s != %s)" -msgstr "Este volumen está fuera de secuencia" +msgstr "Este volumen está fuera de secuencia (%s - %s != %s)" -# Ojo que esto podría referirse a "is not being labelled NOW" en vez de -# "isn't labelled". Pero no tengo los fuentes para ver la intención +# Ojo que esto podría referirse a "is not being labelled NOW" en vez de +# "isn't labelled". Pero no tengo los fuentes para ver la intención # original. nl -# Si no se sabe eso, se podría dejar de forma más neutra como +# Si no se sabe eso, se podría dejar de forma más neutra como # "Archivo no etiquetado para concordancia con `%s'" - gerardo (gag) # FIXME: Preguntar. -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" -msgstr "El archivo no está etiquetado para que coincida con %s" +msgstr "El archivo no está etiquetado para que coincida con %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "El volumen %s no coincide con %s" -#: src/buffer.c:1675 -#, fuzzy, c-format +#: src/buffer.c:1726 +#, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" "%s: el nombre del fichero es demasiado largo para almacenarse en una " "cabecera\n" -"multivolumen de GNU" +"multivolumen de GNU, se trunca" -# Según gag y jmg, hay que decir: "no está en un límite de bloque", pues +# Según gag y jmg, hay que decir: "no está en un límite de bloque", pues # no estamos hablando de un bloque concreto (el bloque) sino de uno cualquiera. -# FIXME: Entonces tal vez el original debería decir "on a block boundary". sv -#: src/buffer.c:1866 -#, fuzzy +# FIXME: Entonces tal vez el original debería decir "on a block boundary". sv +#: src/buffer.c:1917 msgid "write did not end on a block boundary" -msgstr "El fin del archivo %s no está en un límite de bloque" +msgstr "la escritura no terminó en un límite de bloque" #: src/compare.c:96 #, c-format msgid "Could only read %lu of %lu byte" msgid_plural "Could only read %lu of %lu bytes" -msgstr[0] "Sólo se pudieron leer %lu de %lu byte" -msgstr[1] "Sólo se pudieron leer %lu de %lu bytes" +msgstr[0] "Sólo se pudieron leer %lu de %lu byte" +msgstr[1] "Sólo se pudieron leer %lu de %lu bytes" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "El contenido es distinto" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "Fin de fichero inesperado en el archivo" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "El tipo de fichero es distinto" -# El autor quería un mensaje muy conciso, y en la traducción se expande a una -# oración completa.. ¿Por qué? Debería ser "Distinto modo". -# Porque el idioma inglés es más corto. Si a cada frase corta le hago -# corresponder siempre una frase corta española, el resultado sonará a indio -# completamente (me refiero a los indios esos de las películas del oeste, +# El autor quería un mensaje muy conciso, y en la traducción se expande a una +# oración completa.. ¿Por qué? Debería ser "Distinto modo". +# Porque el idioma inglés es más corto. Si a cada frase corta le hago +# corresponder siempre una frase corta española, el resultado sonará a indio +# completamente (me refiero a los indios esos de las películas del oeste, # que solamente hablan con sustantivos, verbos y adjetivos). sv #: src/compare.c:183 src/compare.c:203 src/compare.c:324 msgid "Mode differs" @@ -989,14 +973,14 @@ msgstr "El gid es distinto" #: src/compare.c:212 msgid "Mod time differs" -msgstr "La fecha de modificación es distinta" +msgstr "La fecha de modificación es distinta" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" -msgstr "El tamaño es distinto" +msgstr "El tamaño es distinto" -# Creo que este enlace se efectúa al descomprimir un archivo tar. -# No es que nos diga si está enlazado o no lo está, sino si él hace +# Creo que este enlace se efectúa al descomprimir un archivo tar. +# No es que nos diga si está enlazado o no lo está, sino si él hace # el enlace o no lo hace. sv #: src/compare.c:265 #, c-format @@ -1005,65 +989,62 @@ msgstr "No se enlaza a %s" #: src/compare.c:289 msgid "Symlink differs" -msgstr "El enlace simbólico es distinto" +msgstr "El enlace simbólico es distinto" #: src/compare.c:318 msgid "Device number differs" -msgstr "El número de dispositivo es distinto" +msgstr "El número de dispositivo es distinto" -# "Verifica ". Supongo que depende de si se concatena en algún +# "Verifica ". Supongo que depende de si se concatena en algún # mensaje. jmg -# FUZZY. Es verdad, habrá que verlo. -#: src/compare.c:464 +# FUZZY. Es verdad, habrá que verlo. +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Verificar " -# # ¿Quizá diffed es el participio de diff, siendo esto un verbo tomado -# # del nombre del programa diff? Entonces querría decir que se ha -# # efectuado un diff como si el *fichero* hubiera sido normal. Yo sólo -# # cambiaría "se toma" por "se ha tomado". gag +# # ¿Quizá diffed es el participio de diff, siendo esto un verbo tomado +# # del nombre del programa diff? Entonces querría decir que se ha +# # efectuado un diff como si el *fichero* hubiera sido normal. Yo sólo +# # cambiaría "se toma" por "se ha tomado". gag # Es norma habitual convertir un pasado en un presente en estos casos. # Realmente, dice lo que hace y no lo que ha hecho. sv -# FIXME. Decirle al autor que estandarice las comillas: ¿'%c' o `%c'? -# De momento lo estandarizo en la traducción. -#: src/compare.c:471 -#, fuzzy, c-format +#: src/compare.c:473 +#, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "" -"%s: Tipo de fichero `%c' desconocido, se toma la diferencia\n" +"%s: Tipo de fichero '%c' desconocido, se toma la diferencia\n" "como fichero normal" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "" "El archivo contiene nombres de fichero con los prefijos iniciales eliminados." -#: src/compare.c:533 -#, fuzzy +#: src/compare.c:535 msgid "Archive contains transformed file names." -msgstr "El archivo contiene la marca de tiempo en el futuro %s" +msgstr "El archivo contiene nombres de fichero transformados." -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." -msgstr "Puede que la verificación no encuentre los ficheros originales." +msgstr "Puede que la verificación no encuentre los ficheros originales." -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" -msgstr[0] "FALLO DE VERIFICACIÓN: %d cabecera inválida detectada" -msgstr[1] "FALLO DE VERIFICACIÓN: %d cabeceras inválidas detectadas" +msgstr[0] "FALLO DE VERIFICACIÓN: %d cabecera inválida detectada" +msgstr[1] "FALLO DE VERIFICACIÓN: %d cabeceras inválidas detectadas" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "Un bloque de ceros aislado en %s" #: src/create.c:73 -#, fuzzy, c-format +#, c-format msgid "%s: contains a cache directory tag %s; %s" -msgstr "%s: contiene una marca de directorio caché; no se vuelca" +msgstr "%s: contiene una marca de directorio caché %s; %s" #: src/create.c:262 #, c-format @@ -1082,7 +1063,7 @@ msgstr "Generando cabeceras octales negativas" #: src/create.c:601 src/create.c:664 #, c-format msgid "%s: file name is too long (max %d); not dumped" -msgstr "%s: el nombre del fichero es demasiado largo (máx %d); no se vuelca" +msgstr "%s: el nombre del fichero es demasiado largo (máx %d); no se vuelca" #: src/create.c:611 #, c-format @@ -1096,92 +1077,90 @@ msgstr "" msgid "%s: link name is too long; not dumped" msgstr "%s: el nombre del enlace es demasiado largo; no se vuelca" -# "se rellena" debería ser "rellenando". "se rellena" puede entenderse como -# varias cosas, no queda claro que es lo que se esta haciendo, podría indicar +# "se rellena" debería ser "rellenando". "se rellena" puede entenderse como +# varias cosas, no queda claro que es lo que se esta haciendo, podría indicar # lo que se suele hacer.. =) "rellenando con ceros" es perfecto y es -# exactamente lo que está escrito en el original. sv +# exactamente lo que está escrito en el original. sv # -# Que sí, reconozco que la traducción es un poco libre. -# Pero mi intención es que el programa diga lo que va haciendo, no lo que ya +# Que sí, reconozco que la traducción es un poco libre. +# Pero mi intención es que el programa diga lo que va haciendo, no lo que ya # ha hecho. Ni siquiera el original es consistente en los modos verbales. sv #: src/create.c:1084 #, c-format msgid "%s: File shrank by %s byte; padding with zeros" msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "" -"%s: El tamaño del fichero ha disminuido en %s byte, se rellena con ceros" +"%s: El tamaño del fichero ha disminuido en %s byte, se rellena con ceros" msgstr[1] "" -"%s: El tamaño del fichero ha disminuido en %s bytes, se rellena con ceros" +"%s: El tamaño del fichero ha disminuido en %s bytes, se rellena con ceros" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" -msgstr "%s: el fichero está en un sistema de ficheros distinto; no se vuelca" +msgstr "%s: el fichero está en un sistema de ficheros distinto; no se vuelca" # Se vuelca la *memoria* del proceso en un fichero llamado `core'. -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 -#, fuzzy +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" -msgstr " (memoria volcada)" +msgstr "no se vuelca el contenido" # ignore no es ignorar, es "no hacer caso" # se puede usar: no tener en cuenta, descartar, no tener efecto, # pasar por alto, # ignorar es "not to know". sv -# ¿Y cuando se ignora a una persona ;-)? fr -# Lo mismo: Está mal dicho, se dice que no le haces caso a esa persona. -# Si no me crees busca "ignore" en algún buen diccionario. -# O mira la lista de pifias de Ángel Álvarez directamente. +# ¿Y cuando se ignora a una persona ;-)? fr +# Lo mismo: Está mal dicho, se dice que no le haces caso a esa persona. +# Si no me crees busca "ignore" en algún buen diccionario. +# O mira la lista de pifias de Ãngel Ãlvarez directamente. # La tengo en ftp.unex.es. # Lo siento, Santiago, hemos sido derrotados; "ignorar" ya viene en los -# diccionarios de español, y creo que hasta en el DRAE, con el significado -# que tiene en inglés "to ignore"; aunque nosotros podemos ignorarlo ;-) +# diccionarios de español, y creo que hasta en el DRAE, con el significado +# que tiene en inglés "to ignore"; aunque nosotros podemos ignorarlo ;-) # y seguir en la ortodoxia castellana :-) gerardo -# Seguiremos en la ortodoxia, pero aún así, no puedo creerme que venga -# en el DRAE. ¿Estás seguro? sv -# No, no me compré el DRAE. Pregúntalo a spanglish (si te atreves ;-) gerardo -#: src/create.c:1438 +# Seguiremos en la ortodoxia, pero aún así, no puedo creerme que venga +# en el DRAE. ¿Estás seguro? sv +# No, no me compré el DRAE. Pregúntalo a spanglish (si te atreves ;-) gerardo +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" -msgstr "%s: Tipo de fichero desconocido; no se tendrá en cuenta" +msgstr "%s: Tipo de fichero desconocido; no se tendrá en cuenta" -#: src/create.c:1549 -#, fuzzy, c-format +#: src/create.c:1551 +#, c-format msgid "Missing links to %s." -msgstr "Faltan enlaces a '%s'.\n" +msgstr "Faltan enlaces a %s." -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: el fichero no ha cambiado; no se vuelca" # FIXME: Decir al autor que ponga el "itself". sv -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: el fichero es el propio archivo; no se vuelca" -#: src/create.c:1747 src/incremen.c:603 -#, fuzzy +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" -msgstr "%s: contiene una marca de directorio caché; no se vuelca" +msgstr "no se vuelca el directorio" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" -msgstr "%s: el fichero cambió mientras se estaba leyendo" +msgstr "%s: el fichero cambió mientras se estaba leyendo" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" -msgstr "%s: el `socket' no se tendrá en cuenta" +msgstr "%s: el `socket' no se tendrá en cuenta" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" -msgstr "%s: no se tendrá en cuenta la puerta" +msgstr "%s: no se tendrá en cuenta la puerta" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Saltando a la siguiente cabecera" @@ -1195,9 +1174,9 @@ msgid "%s: implausibly old time stamp %s" msgstr "%s: marca de fecha sospechosamente antigua %s" #: src/extract.c:320 -#, fuzzy, c-format +#, c-format msgid "%s: time stamp %s is %s s in the future" -msgstr "%s: la marca de tiempo %s está %lu s en el futuro" +msgstr "%s: la marca de tiempo %s está %s s en el futuro" #: src/extract.c:536 #, c-format @@ -1207,7 +1186,7 @@ msgstr "%s: Inconsistencia inesperada al crear el directorio" #: src/extract.c:705 #, c-format msgid "%s: skipping existing file" -msgstr "" +msgstr "%s: se salta un fichero que existe" #: src/extract.c:821 #, c-format @@ -1218,43 +1197,40 @@ msgstr "" # Nota: En Unix, se llama fichero *regular* al que no es ni un directorio, # ni un dispositivo (de bloques o de caracteres) ni un fifo, etc. # Uno puede pensar que son los ficheros "normales", pero eso depende, -# pues un directorio es de lo más "normal"... +# pues un directorio es de lo más "normal"... #: src/extract.c:1010 msgid "Extracting contiguous files as regular files" msgstr "Extrayendo ficheros contiguos como ficheros regulares" -# ¿Enlaces fuertes? Aquí los profes. de Sistemas Operativos y otros -# dicen "enlaces duros", y creo que los libros también lo ponen así. gag -# Es una cuestión todavía no dirimida. -# ¿Tienes algún dato más? ¿Qué dicen los libros? sv +# ¿Enlaces fuertes? Aquí los profes. de Sistemas Operativos y otros +# dicen "enlaces duros", y creo que los libros también lo ponen así. gag +# Es una cuestión todavía no dirimida. +# ¿Tienes algún dato más? ¿Qué dicen los libros? sv # Enlaces duros. Lo acabo de mirar en un libro. gag #: src/extract.c:1365 msgid "Attempting extraction of symbolic links as hard links" -msgstr "Intentando la extracción de enlaces simbólicos como enlaces duros" +msgstr "Intentando la extracción de enlaces simbólicos como enlaces duros" #: src/extract.c:1528 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" -msgstr "%s: No se puede extraer -- el fichero es continuación de otro volumen" +msgstr "%s: No se puede extraer -- el fichero es continuación de otro volumen" -# ¿No se referirá al autor a "mangled filenames"?... jmg -# FIXME. Preguntárselo. -#: src/extract.c:1535 src/list.c:1135 -#, fuzzy +# ¿No se referirá al autor a "mangled filenames"?... jmg +# FIXME. Preguntárselo. +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" -msgstr "Fin de fichero inesperado en los nombres modificados" +msgstr "Cabecera de nombres largos inesperada" -# FIXME. Lo de las comillas '%c'. -# Como antes, lo estandarizo en la traducción a pesar de todo. #: src/extract.c:1542 -#, fuzzy, c-format +#, c-format msgid "%s: Unknown file type '%c', extracted as normal file" -msgstr "%s: Tipo de fichero `%c' desconocido, se extrae como fichero normal" +msgstr "%s: Tipo de fichero '%c' desconocido, se extrae como fichero normal" #: src/extract.c:1568 -#, fuzzy, c-format +#, c-format msgid "Current %s is newer or same age" -msgstr "El `%s' actual es más reciente" +msgstr "El %s actual es más reciente o de la misma fecha" #: src/extract.c:1620 #, c-format @@ -1262,14 +1238,14 @@ msgid "%s: Was unable to backup this file" msgstr "%s: No se pudo hacer copia de seguridad de este fichero" #: src/extract.c:1767 -#, fuzzy, c-format +#, c-format msgid "Cannot rename %s to %s" -msgstr "%s: No se puede renombrar a %s" +msgstr "No se puede renombrar %s a %s" #: src/incremen.c:494 src/incremen.c:536 -#, fuzzy, c-format +#, c-format msgid "%s: Directory has been renamed from %s" -msgstr "%s: El directorio ha sido renombrado" +msgstr "%s: El directorio ha sido renombrado desde %s" #: src/incremen.c:549 #, c-format @@ -1277,372 +1253,370 @@ msgid "%s: Directory is new" msgstr "%s: El directorio es nuevo" #: src/incremen.c:566 -#, fuzzy, c-format +#, c-format msgid "%s: directory is on a different filesystem; not dumped" -msgstr "%s: el fichero está en un sistema de ficheros distinto; no se vuelca" +msgstr "" +"%s: el directorio está en un sistema de ficheros distinto; no se vuelca" #: src/incremen.c:587 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: El directorio ha sido renombrado" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" -msgstr "Marca de tiempo inválida" +msgstr "Marca de tiempo inválida" -#: src/incremen.c:1045 -#, fuzzy +#: src/incremen.c:1047 msgid "Invalid modification time" -msgstr "Se ha especificado un modo no válido en la opción" +msgstr "Fecha de modificación inválida" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" -msgstr "" +msgstr "Fecha de modificación inválida (nanosegundos)" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" -msgstr "Número de dispositivo inválido" +msgstr "Número de dispositivo inválido" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" -msgstr "Número de nodo-i inválido" +msgstr "Número de nodo-i inválido" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" msgstr "" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Fin de fichero inesperado en el archivo" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 -#, fuzzy, c-format +#: src/incremen.c:1178 +#, c-format msgid "%s: byte %s: %s %s" -msgstr "%s: No se puede crear el enlace simbólico %s %s" +msgstr "%s: byte %s: %s %s" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" -msgstr "" +msgstr "%s: byte %s: %s" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" -msgstr "" +msgstr "Falta la terminación del registro" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1566 +#: src/incremen.c:1568 #, fuzzy msgid "Malformed dumpdir: empty name in 'R'" -msgstr "Argumento de densidad mal formado: '%s'" +msgstr "Argumento de densidad mal formado: %s" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1585 +#: src/incremen.c:1587 #, fuzzy msgid "Malformed dumpdir: empty name in 'T'" -msgstr "Argumento de densidad mal formado: '%s'" +msgstr "Argumento de densidad mal formado: %s" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" -msgstr "" +msgstr "No se puede crear un directorio temporal usando la plantilla %s" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: No se purga el directorio: no se puede efectuar `stat'" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" -msgstr "%s: el directorio está en un dispositivo distinto: no se purga" +msgstr "%s: el directorio está en un dispositivo distinto: no se purga" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Borrando %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: No se puede borrar" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: Se omite" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "bloque %s: ** Bloque de NULos **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "bloque %s: ** Fin de Fichero **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "bloque %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" -msgstr "Hay blancos en la cabecera cuando se esperaba el valor numérico %s" +msgstr "Hay blancos en la cabecera cuando se esperaba el valor numérico %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" -"El valor octal %.*s del archivo está fuera del rango %s;\n" +"El valor octal %.*s del archivo está fuera del rango %s;\n" "se supone complemento a dos" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" -msgstr "El valor octal %.*s del archivo está fuera del rango %s" +msgstr "El valor octal %.*s del archivo está fuera del rango %s" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "El archivo contiene cabeceras base 64 obsoletas" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" -msgstr "La cadena firmada en base 64 %s del archivo está fuera del rango %s" +msgstr "La cadena firmada en base 64 %s del archivo está fuera del rango %s" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" -msgstr "El valor en base 256 del archivo está fuera del rango %s" +msgstr "El valor en base 256 del archivo está fuera del rango %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" -msgstr "El archivo contiene %.*s donde se esperaba el valor numérico %s" +msgstr "El archivo contiene %.*s donde se esperaba el valor numérico %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 -#, fuzzy, c-format +#: src/list.c:934 +#, c-format msgid "Archive value %s is out of %s range %s..%s" -msgstr "El valor del archivo %s está fuera del rango %s %s.%s" +msgstr "El valor del archivo %s está fuera del rango de %s %s..%s" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " enlace a %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " tipo de fichero desconocido %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--Enlace largo--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--Nombre largo--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Cabecera de Volumen--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" -msgstr "--Continúa en el byte %s--\n" +msgstr "--Continúa en el byte %s--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Creando el directorio:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "Se renombra %s como %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: No se puede renombrar a %s" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "Se vuelve a renombrar %s como %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: El fichero fue borrado antes de leerlo" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "proceso hijo" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "canal de interproceso" #: src/names.c:360 -#, fuzzy msgid "command line" -msgstr "La orden `%s' falló" +msgstr "línea de órdenes" -# FIXME: Decir al autor que ponga el "itself". sv #: src/names.c:378 #, fuzzy, c-format msgid "%s: file list requested from %s already read from %s" -msgstr "%s: el fichero es el propio archivo; no se vuelca" +msgstr "%s: ya se ha leído la lista de ficheros" -# Uff, a lo mejor se asusta el usuario si ponemos 'no se pudo leer con stat() -# el estado del fichero em+ -# stat() es una primitiva Unix que acaba de fallar; también podría -# ser: "No se puede hacer stat() del fichero %s", o "stat() ha fallado..." -# Aunque tal como está es más descriptivo para el neófito, desde -# luego. gag -#: src/names.c:448 -#, fuzzy, c-format +#: src/names.c:448 src/checkpoint.c:274 +#, c-format msgid "cannot split string '%s': %s" -msgstr "No se puede leer el estado del fichero %s" +msgstr "no se puede dividir la cadena '%s': %s" #: src/names.c:490 #, c-format msgid "%s: file name read contains nul character" -msgstr "" +msgstr "%s: el nombre de fichero leído contiene el carácter nul" -#: src/names.c:821 -#, fuzzy +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "" -"los patrones de exclusión encajan con el comienzo del nombre del fichero" +"Se han utilizado caracteres de expresiones regulares en los nombres de los " +"ficheros" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" +"Utilice --wildcards para activar el encaje de patrones, o --no-wildcards " +"para suprimir este aviso" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: No se encuentra en el archivo" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: El elemento solicitado no se encuentra en el archivo" -# Ojo que esto podría referirse a "is not being labelled NOW" en vez de -# "isn't labelled". Pero no tengo los fuentes para ver la intención +# Ojo que esto podría referirse a "is not being labelled NOW" en vez de +# "isn't labelled". Pero no tengo los fuentes para ver la intención # original. nl -# Si no se sabe eso, se podría dejar de forma más neutra como +# Si no se sabe eso, se podría dejar de forma más neutra como # "Archivo no etiquetado para concordancia con `%s'" - gerardo (gag) # FIXME: Preguntar. -#: src/names.c:876 +#: src/names.c:879 #, fuzzy, c-format msgid "Archive label mismatch" -msgstr "El archivo no está etiquetado para que coincida con %s" +msgstr "El archivo no está etiquetado para que coincida con %s" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" +"Usar la opción -C dentro de una lista de ficheros no está permitido con --" +"listed-incremental" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" -msgstr "" +msgstr "Solamente se permite una opción -C con --listed-incremental" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" -msgstr "Las opciones `-%s' y `-%s' requieren entrada estándar" +msgid "Options '%s' and '%s' both want standard input" +msgstr "Las opciones '-%s' y '-%s' requieren entrada estándar" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" -msgstr "%s: Formato de archivo inválido" +msgstr "%s: Formato de archivo inválido" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" -msgstr "Se requieren características de GNU en formato de archivo incompatible" +msgstr "Se requieren características de GNU en formato de archivo incompatible" -#: src/tar.c:255 +#: src/tar.c:264 #, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." msgstr "" +"Estilo de cita '%s' desconocido. Pruebe '%s --quoting-style=help' para " +"obtener una lista." -# Yo usaría "recuperar", en vez de "restablecer". Lo de repetir "archivo" -# dos veces en la misma frase no me suena bien, así que pondría "... a -# partir de aquél". jmg -# El original también repite. sv +# Yo usaría "recuperar", en vez de "restablecer". Lo de repetir "archivo" +# dos veces en la misma frase no me suena bien, así que pondría "... a +# partir de aquél". jmg +# El original también repite. sv # -# ¡CUIDADO! sólo no debe llevar tilde en ".. juntos en un solo archivo..." -# `Solo' sólo lleva acento cuando equivale al adverbio de modo `solamente', -# y aun así no es obligatorio ponérselo si no hay ambigüedad (lo siento, -# muchachos, pero saqué sobresaliente en Lingüística de COU :-D ) gerardo -# Lo cambio, pero "no es obligatorio" no es lo mismo que "está mal". sv +# ¡CUIDADO! sólo no debe llevar tilde en ".. juntos en un solo archivo..." +# `Solo' sólo lleva acento cuando equivale al adverbio de modo `solamente', +# y aun así no es obligatorio ponérselo si no hay ambigüedad (lo siento, +# muchachos, pero saqué sobresaliente en Lingüística de COU :-D ) gerardo +# Lo cambio, pero "no es obligatorio" no es lo mismo que "está mal". sv # -# # la versión de control -> el control de versión +# # la versión de control -> el control de versión # # nil: numeradas... simples... (en plural) # # never, simPle (falta una pe): backup -> copia de seguridad. gag -# Estoy de acuerdo con lo de gag (más arriba usas eso mismo). jmg -#: src/tar.c:364 +# Estoy de acuerdo con lo de gag (más arriba usas eso mismo). jmg +#: src/tar.c:378 #, fuzzy msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " @@ -1672,22 +1646,22 @@ msgstr "" " en otro caso\n" " never, simple siempre hace copias de seguridad simples\n" -# Yo usaría "recuperar", en vez de "restablecer". Lo de repetir "archivo" -# dos veces en la misma frase no me suena bien, así que pondría "... a -# partir de aquél". jmg -# El original también repite. sv +# Yo usaría "recuperar", en vez de "restablecer". Lo de repetir "archivo" +# dos veces en la misma frase no me suena bien, así que pondría "... a +# partir de aquél". jmg +# El original también repite. sv # -# ¡CUIDADO! sólo no debe llevar tilde en ".. juntos en un solo archivo..." -# `Solo' sólo lleva acento cuando equivale al adverbio de modo `solamente', -# y aun así no es obligatorio ponérselo si no hay ambigüedad (lo siento, -# muchachos, pero saqué sobresaliente en Lingüística de COU :-D ) gerardo -# Lo cambio, pero "no es obligatorio" no es lo mismo que "está mal". sv +# ¡CUIDADO! sólo no debe llevar tilde en ".. juntos en un solo archivo..." +# `Solo' sólo lleva acento cuando equivale al adverbio de modo `solamente', +# y aun así no es obligatorio ponérselo si no hay ambigüedad (lo siento, +# muchachos, pero saqué sobresaliente en Lingüística de COU :-D ) gerardo +# Lo cambio, pero "no es obligatorio" no es lo mismo que "está mal". sv # -# # la versión de control -> el control de versión +# # la versión de control -> el control de versión # # nil: numeradas... simples... (en plural) # # never, simPle (falta una pe): backup -> copia de seguridad. gag -# Estoy de acuerdo con lo de gag (más arriba usas eso mismo). jmg -#: src/tar.c:373 +# Estoy de acuerdo con lo de gag (más arriba usas eso mismo). jmg +#: src/tar.c:387 #, fuzzy msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1718,86 +1692,86 @@ msgstr "" " en otro caso\n" " never, simple siempre hace copias de seguridad simples\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" -msgstr "Modo principal de operación:" +msgstr "Modo principal de operación:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "lista el contenido de un archivo" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "extrae ficheros de un archivo" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "crea un nuevo archivo" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "encuentra las diferencias entre un archivo y el sistema de ficheros" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" -msgstr "añade ficheros al final de un archivo" +msgstr "añade ficheros al final de un archivo" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" -msgstr "solamente añade ficheros más recientes que la copia del archivo" +msgstr "solamente añade ficheros más recientes que la copia del archivo" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" -msgstr "añade ficheros tar a un archivo" +msgstr "añade ficheros tar a un archivo" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" -msgstr "borra del archivo (¡no en cintas magnéticas!)" +msgstr "borra del archivo (¡no en cintas magnéticas!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" -msgstr "" +msgstr "comprueba la etiqueta de volumen del archivo y finaliza" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" -msgstr "Modificadores de operación:" +msgstr "Modificadores de operación:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "maneja ficheros dispersos de forma eficiente" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" -msgstr "" +msgstr "PRINCIPAL[.SECUNDARIO]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "maneja el formato GNU antiguo de respaldo incremental" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "maneja el nuevo formato GNU de respaldo incremental" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "" -# ¿archivos nonzero? sv -# Estupendo Gerardo, se me había pasado, como tantas cosas em+ -# # ¡Nooorl! Quiere decir que el programa tar no acaba o sale (exit()) +# ¿archivos nonzero? sv +# Estupendo Gerardo, se me había pasado, como tantas cosas em+ +# # ¡Nooorl! Quiere decir que el programa tar no acaba o sale (exit()) # # devolviendo al sistema un "status" distinto de cero cuando -# # encuentre ficheros ilegibles. (¡Uf! Ahora a ver cómo se pone esto en -# # media línea.) gag +# # encuentre ficheros ilegibles. (¡Uf! Ahora a ver cómo se pone esto en +# # media línea.) gag # -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "no sale con estado distinto de cero cuando hay ficheros ilegibles" -#: src/tar.c:445 +#: src/tar.c:459 #, fuzzy msgid "" "process only the NUMBERth occurrence of each file in the archive; this " @@ -1805,586 +1779,615 @@ msgid "" "diff, --extract or --list and when a list of files is given either on the " "command line or via the -T option; NUMBER defaults to 1" msgstr "" -"procesa únicamente la NUM-ésima aparición de cada fichero en el archivo. " -"Esta opción solamente es válida junto con una de las subórdenes --delete, --" -"diff, --extract o --list y cuando se da una lista de ficheros en la línea de " -"órdenes o con la opción -T. El valor predeterminado de NUM es 1." +"procesa únicamente la NUM-ésima aparición de cada fichero en el archivo. " +"Esta opción solamente es válida junto con una de las subórdenes --delete, --" +"diff, --extract o --list y cuando se da una lista de ficheros en la línea de " +"órdenes o con la opción -T. El valor predeterminado de NUM es 1." # Mejor eso que inventarse un palabro, digo yo. sv -#: src/tar.c:451 -#, fuzzy +#: src/tar.c:465 msgid "archive is seekable" -msgstr "El archivo admite `seek'" +msgstr "el archivo admite `seek'" # Mejor eso que inventarse un palabro, digo yo. sv -#: src/tar.c:453 -#, fuzzy +#: src/tar.c:467 msgid "archive is not seekable" -msgstr "El archivo admite `seek'" +msgstr "el archivo no admite `seek'" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "" +"no comprueba los números de dispositivo cuando se crean archivos " +"incrementales" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" +"comprueba los números de dispositivo cuando se crean archivos incrementales " +"(por omisión)" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" -msgstr "" +msgstr "Control de sobreescritura:" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" -msgstr "intenta verificar el archivo después de escribirlo" +msgstr "intenta verificar el archivo después de escribirlo" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" -msgstr "borra los ficheros después de añadirlos al archivo" +msgstr "borra los ficheros después de añadirlos al archivo" -#: src/tar.c:471 +#: src/tar.c:485 #, fuzzy msgid "don't replace existing files when extracting, treat them as errors" msgstr "no reemplaza ficheros que existan al extraer" -#: src/tar.c:474 +#: src/tar.c:488 #, fuzzy msgid "don't replace existing files when extracting, silently skip over them" msgstr "no reemplaza ficheros que existan al extraer" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -"no reemplaza los ficheros que existan que sean más recientes que sus copias " +"no reemplaza los ficheros que existan que sean más recientes que sus copias " "en el archivo" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "sobreescribe los ficheros que existan al extraer" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" -msgstr "borra cada fichero antes de extraer sobre él" +msgstr "borra cada fichero antes de extraer sobre él" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" -msgstr "vacía jerarquías antes de extraer directorios" +msgstr "vacía jerarquías antes de extraer directorios" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "conserva los metadatos de los directorios que existan" -#: src/tar.c:487 +#: src/tar.c:501 #, fuzzy msgid "overwrite metadata of existing directories when extracting (default)" msgstr "sobreescribe los ficheros que existan al extraer" -#: src/tar.c:490 +#: src/tar.c:504 #, fuzzy msgid "preserve existing symlinks to directories when extracting" msgstr "sobreescribe los ficheros que existan al extraer" -#: src/tar.c:496 -msgid "Select output stream:" +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "DIR" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" msgstr "" -#: src/tar.c:499 +#: src/tar.c:513 +msgid "Select output stream:" +msgstr "Selección del flujo de salida:" + +#: src/tar.c:516 msgid "extract files to standard output" -msgstr "extrae los ficheros a la salida estándar" +msgstr "extrae los ficheros a la salida estándar" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "ORDEN" -#: src/tar.c:501 -#, fuzzy +#: src/tar.c:518 msgid "pipe extracted files to another program" -msgstr "extrae los ficheros a la salida estándar" +msgstr "extrae los ficheros a otro programa" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" -msgstr "" +msgstr "descarta los códigos de salida de los procesos hijos" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "" +"trata los estados de salida distintos de cero de los hijos como errores" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Manejo de los atributos del fichero:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" -msgstr "fuerza NOMBRE como propietario de los ficheros que se añaden" +msgstr "fuerza NOMBRE como propietario de los ficheros que se añaden" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" -msgstr "fuerza NOMBRE como grupo para los ficheros que se añaden" +msgstr "fuerza NOMBRE como grupo para los ficheros que se añaden" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "FECHA-O-FICHERO" -#: src/tar.c:517 +#: src/tar.c:534 #, fuzzy msgid "set mtime for added files from DATE-OR-FILE" -msgstr "almacena solamente ficheros más recientes que FECHA-O-FICHERO" +msgstr "almacena solamente ficheros más recientes que FECHA-O-FICHERO" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "CAMBIOS" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" -msgstr "fuerza CAMBIOS (simbólicos) de modo para los ficheros que se añaden" +msgstr "fuerza CAMBIOS (simbólicos) de modo para los ficheros que se añaden" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" -msgstr "" +msgstr "MÉTODO" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " "place (METHOD='system')" msgstr "" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" -msgstr "no extrae la fecha de modificación del fichero" +msgstr "no extrae la fecha de modificación del fichero" -#: src/tar.c:528 +#: src/tar.c:545 #, fuzzy msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" msgstr "intenta extraer los ficheros con el mismo propietario" -#: src/tar.c:530 -#, fuzzy +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" -msgstr "extrae los ficheros como usted mismo" +msgstr "" +"extrae los ficheros como usted mismo (predeterminado para usuarios normales)" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" -msgstr "utiliza siempre números para los nombres de usuarios/grupos" +msgstr "utiliza siempre números para los nombres de usuarios/grupos" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" +"extrae la información de los permisos de los ficheros (por omisión para el " +"superusuario)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" +"aplica el umask del usuario cuando se extraen permisos del archivo " +"(predeterminado para usuarios normales)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" -msgstr "" +msgstr "se listan los miembros en el mismo orden que los ficheros del archivo" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "lo mismo que -p y -s" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" +"demora el establecimiento de las fechas de modificación y los permisos de " +"los directorios que se extraen hasta el final de la extracción" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" +msgstr "cancela el efecto de la opción --delay-directory-restore" + +#: src/tar.c:567 +msgid "ORDER" msgstr "" -#: src/tar.c:554 -#, fuzzy +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 msgid "Handling of extended file attributes:" -msgstr "Manejo de los atributos del fichero:" +msgstr "Manejo de los atributos extendidos del fichero:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" -msgstr "" +msgstr "Activa el soporte de los atributos extendidos" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" -msgstr "" +msgstr "Desactiva el soporte de atributos extendidos" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" -msgstr "" +msgstr "especifica el patrón de inclusión para las claves xattr" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" -msgstr "" +msgstr "especifica el patrón de exclusión para las claves xattr" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" -msgstr "" +msgstr "Activa el soporte de contextos SELinux" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" -msgstr "" +msgstr "Desactiva el soporte de contextos SELinux" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" -msgstr "" +msgstr "Activa el soporte de ACLs de POSIX" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" -msgstr "" +msgstr "Desactiva el soporte de ACLs de POSIX" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" -msgstr "Selección de dispositivo y opciones:" +msgstr "Selección de dispositivo y opciones:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ARCHIVO" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "utiliza un archivo o el dispositivo ARCHIVO" -#: src/tar.c:581 -#, fuzzy +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "el archivo es local incluso si tiene dos puntos" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "utiliza la ORDEN rmt dada en vez de rmt" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "utiliza la ORDEN remota en vez de rsh" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "especifica la unidad y la densidad" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "crea/lista/extrae un archivo multivolumen" # Una chorradita, si se me permite; estamos usando ISO-8859-1, -# ¿verdad? Y en ISO-Latin1 existe un carácter que representa la -# multiplicación, ¿verdad? Ya saben , el aspa: '×' ('\327'). Pues -# ¿por qué no usarlo (está bien, "utilizarlo" ;-) en vez de la equis -# en NUM x 1024 -> NUM × 1024? -# En otra parte dices que pones (C) en vez de © porque © no se ve bien en -# la consola. Pues no dirás eso del aspa, que se ve mejor aún que la equis: -# x × - gerardo +# ¿verdad? Y en ISO-Latin1 existe un carácter que representa la +# multiplicación, ¿verdad? Ya saben , el aspa: '×' ('\327'). Pues +# ¿por qué no usarlo (está bien, "utilizarlo" ;-) en vez de la equis +# en NUM x 1024 -> NUM × 1024? +# En otra parte dices que pones (C) en vez de © porque © no se ve bien en +# la consola. Pues no dirás eso del aspa, que se ve mejor aún que la equis: +# x × - gerardo # Efectivamente, pero no es transportable, el que use tar bajo DJGPP -# le saldría un churro pues el aspa no existe en la tabla 850. sv -#: src/tar.c:605 +# le saldría un churro pues el aspa no existe en la tabla 850. sv +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" -msgstr "cambia la cinta después de escribir NÚMERO x 1024 bytes" +msgstr "cambia la cinta después de escribir NÚMERO x 1024 bytes" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "ejecuta un script al final de cada cinta (implica -M)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" -msgstr "usa/actualiza el número de volumen en FICHERO" +msgstr "usa/actualiza el número de volumen en FICHERO" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "Bloques en los dispositivos:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "BLOQUES" # Sigo en mis 13 y en esto no hay quien me baje del burro: BLOQUES x 512 bytes -# debe ser BLOQUES × 512 bytes. gerardo -#: src/tar.c:618 +# debe ser BLOQUES × 512 bytes. gerardo +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "BLOQUES x 512 bytes por registro" -#: src/tar.c:620 -#, fuzzy +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" -msgstr "TAMAÑO bytes por registro, múltiplo de 512" +msgstr "NÚMERO de bytes por registro, múltiplo de 512" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" "no tiene en cuenta los bloques convertidos en ceros dentro de un archivo " "(significa fin de fichero)" -# ¿rebloquea? ¿existe esa palabra? sv -# Que opine el pueblo, no lo sé. fr -# # ¿Existe bloquear? Pues si es así, también existe rebloquear = -# # volver a bloquear. Y requetebloquear, etc. En un artículo de Martin -# # Gardner se preguntaba cuál era la palabra española más larga, y la +# ¿rebloquea? ¿existe esa palabra? sv +# Que opine el pueblo, no lo sé. fr +# # ¿Existe bloquear? Pues si es así, también existe rebloquear = +# # volver a bloquear. Y requetebloquear, etc. En un artículo de Martin +# # Gardner se preguntaba cuál era la palabra española más larga, y la # # respuesta era que cualquiera que pudiera ir precedida por -# # requetequetequete... (longitud infinita). Pelín ssagerao, ¿no? gag +# # requetequetequete... (longitud infinita). Pelín ssagerao, ¿no? gag # # Bueno, al final he puesto lo que se ve, un poco menos raro que rebloquear. sv -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" -msgstr "rehace los bloques conforme se lee (para tuberías de 4.2BSD)" +msgstr "rehace los bloques conforme se lee (para tuberías de 4.2BSD)" -# ¿Qué será esto? ¿Quizás un fallo en el mensaje original? Porque "to" +# ¿Qué será esto? ¿Quizás un fallo en el mensaje original? Porque "to" # no es "desde", sino "hacia", que yo sepa. Pero `archivo hacia la -# salida estándar' no pega mucho. Está en otros mensajes, como el +# salida estándar' no pega mucho. Está en otros mensajes, como el # siguiente; no lo entiendo. - gerardo -# FIXME. Tienes razón. Es muy raro. -#: src/tar.c:629 +# FIXME. Tienes razón. Es muy raro. +#: src/tar.c:653 msgid "Archive format selection:" -msgstr "Selección del formato de archivo:" +msgstr "Selección del formato de archivo:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "FORMATO" -#: src/tar.c:632 -#, fuzzy +#: src/tar.c:656 msgid "create archive of the given format" -msgstr "crea un archivo en el formato dado." +msgstr "crea un archivo en el formato dado" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "FORMATO es uno de los siguientes:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "formato tar V7 antiguo" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "formato GNU de tar <= 1.12" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "formato GNU tar 1.13.x" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "formato POSIX 1003.1-1988 (ustar)" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "formato POSIX 1003.1-2001 (pax)" -#: src/tar.c:645 -#, fuzzy +#: src/tar.c:669 msgid "same as pax" -msgstr "Lo mismo que pax" +msgstr "lo mismo que pax" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "lo mismo que --format=v7" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "lo mismo que --format=posix" -#: src/tar.c:652 +#: src/tar.c:676 #, fuzzy msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "palabra[[:]=valor][,palabra[[:]=valor], ...]" -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "palabras clave de control de pax" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "TEXTO" -#: src/tar.c:655 +#: src/tar.c:679 #, fuzzy msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" "crea un archivo con nombre de volumen NOMBRE. En el momento de listar/" -"extraer, utiliza TEXTO como patrón expandible" +"extraer, utiliza TEXTO como patrón expandible" -#: src/tar.c:660 -#, fuzzy +#: src/tar.c:684 msgid "Compression options:" -msgstr "Opciones de compresión en conflicto" +msgstr "Opciones de compresión:" -#: src/tar.c:662 +#: src/tar.c:686 #, fuzzy msgid "use archive suffix to determine the compression program" -msgstr "No se puede escribir al programa de compresión" +msgstr "No se puede escribir al programa de compresión" -#: src/tar.c:664 +#: src/tar.c:688 #, fuzzy msgid "do not use archive suffix to determine the compression program" -msgstr "No se puede escribir al programa de compresión" +msgstr "No se puede escribir al programa de compresión" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "PROG" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" -msgstr "filtra a través de PROG (debe aceptar -d)" +msgstr "filtra a través de PROG (debe aceptar -d)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" -msgstr "Selección del fichero local:" +msgstr "Selección del fichero local:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" +"añade el FICHERO dado al archivo (útil si su nombre comienza con un guion)" -#: src/tar.c:687 -msgid "DIR" -msgstr "DIR" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "cambia al directorio DIR" -#: src/tar.c:690 -#, fuzzy +#: src/tar.c:714 msgid "get names to extract or create from FILE" -msgstr "obtiene los nombres que se van a extraer o crear del fichero NOMBRE" +msgstr "obtiene los nombres que se van a extraer o crear de FICHERO" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "-T lee nombres terminados en nulo, desactiva -C" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" -msgstr "" +msgstr "desactiva el efecto de la opción --null anterior" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +msgid "unquote input file or member names (default)" msgstr "" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +msgid "do not unquote input file or member names" msgstr "" -# Nota: La diferencia entre un PATRÓN y una EXPREG es que +# Nota: La diferencia entre un PATRÓN y una EXPREG es que # el primero se refiere a un "globbing pattern", es decir, patrones -# de expansión de nombres de ficheros, como * y ?, mientras que +# de expansión de nombres de ficheros, como * y ?, mientras que # el segundo se refiere a expresiones regulares como las de grep, # es decir, ^, $, ., *, etc. -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" -msgstr "PATRÓN" +msgstr "PATRÓN" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" -msgstr "excluye ficheros, dados como un PATRÓN" +msgstr "excluye ficheros, dados como un PATRÓN" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "excluye los patrones listados en FICHERO" -#: src/tar.c:704 +#: src/tar.c:728 #, fuzzy msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" -msgstr "excluye los directorios que contienen una marca de caché" +msgstr "excluye los directorios que contienen una marca de caché" -#: src/tar.c:707 +#: src/tar.c:731 #, fuzzy msgid "exclude everything under directories containing CACHEDIR.TAG" -msgstr "excluye los directorios que contienen una marca de caché" +msgstr "excluye los directorios que contienen una marca de caché" -#: src/tar.c:710 +#: src/tar.c:734 #, fuzzy msgid "exclude directories containing CACHEDIR.TAG" -msgstr "excluye los directorios que contienen una marca de caché" +msgstr "excluye los directorios que contienen una marca de caché" -#: src/tar.c:712 +#: src/tar.c:736 #, fuzzy msgid "exclude contents of directories containing FILE, except for FILE itself" -msgstr "excluye los directorios que contienen una marca de caché" +msgstr "excluye los directorios que contienen una marca de caché" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 #, fuzzy msgid "exclude everything under directories containing FILE" -msgstr "excluye los directorios que contienen una marca de caché" +msgstr "excluye los directorios que contienen una marca de caché" -#: src/tar.c:717 +#: src/tar.c:747 #, fuzzy msgid "exclude directories containing FILE" -msgstr "excluye los directorios que contienen una marca de caché" +msgstr "excluye los directorios que contienen una marca de caché" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" +msgstr "excluye los directorios de sistemas de control de versiones" + +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" msgstr "" -#: src/tar.c:721 +#: src/tar.c:753 msgid "exclude backup and lock files" -msgstr "" +msgstr "excluye los ficheros de respaldo y de bloqueo" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" -msgstr "evita descender automáticamente en los directorios" +msgstr "evita descender automáticamente en los directorios" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "permanece en el sistema de ficheros locales al crear el archivo" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" -msgstr "opera recursivamente sobre los directorios (por omisión)" +msgstr "opera recursivamente sobre los directorios (por omisión)" -#: src/tar.c:729 -#, fuzzy +#: src/tar.c:761 msgid "don't strip leading '/'s from file names" -msgstr "no elimina la `/' inicial de los nombres de ficheros" +msgstr "no elimina las '/'s iniciales de los nombres de ficheros" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "" +"sigue los enlaces simbólicos; archiva y vuelca los ficheros a los que apuntan" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "" +"sigue los enlaces duros; archiva y vuelca los ficheros a los que se refieren" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "NOMBRE-DE-MIEMBRO" -#: src/tar.c:735 +#: src/tar.c:767 #, fuzzy msgid "begin at member MEMBER-NAME when reading the archive" msgstr "comienza por el miembro NOMBRE-DE-MIEMBRO dentro del archivo" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" -msgstr "almacena solamente ficheros más recientes que FECHA-O-FICHERO" +msgstr "almacena solamente ficheros más recientes que FECHA-O-FICHERO" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "FECHA" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "compara la fecha y hora solamente cuando cambian los datos" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "CONTROL" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" -msgstr "se hace un respaldo antes de borrar, escoja el CONTROL de versión" +msgstr "se hace un respaldo antes de borrar, escoja el CONTROL de versión" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "CADENA" -#: src/tar.c:744 +#: src/tar.c:776 #, fuzzy msgid "" "backup before removal, override usual suffix ('~' unless overridden by " @@ -2394,105 +2397,108 @@ msgstr "" "que se\n" "cambie con la variable de entorno SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:749 +#: src/tar.c:781 +#, fuzzy msgid "File name transformations:" -msgstr "" +msgstr "Opciones de creación de ficheros:" -#: src/tar.c:751 +#: src/tar.c:783 #, fuzzy msgid "strip NUMBER leading components from file names on extraction" -msgstr "elimina NÚMERO componentes iniciales de los nombres de ficheros" +msgstr "elimina NÚMERO componentes iniciales de los nombres de ficheros" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" -msgstr "" +msgstr "EXPRESIÓN" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "" +"utiliza la EXPRESIÓN de reemplazo sed para transformar los nombres de " +"ficheros" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:763 -#, fuzzy +#: src/tar.c:795 msgid "ignore case" -msgstr "la exclusión no distingue mayúsculas de minúsculas" +msgstr "no distingue mayúsculas de minúsculas" -#: src/tar.c:765 +#: src/tar.c:797 #, fuzzy msgid "patterns match file name start" msgstr "" -"los patrones de exclusión encajan con el comienzo del nombre del fichero" +"los patrones de exclusión encajan con el comienzo del nombre del fichero" -#: src/tar.c:767 +#: src/tar.c:799 #, fuzzy msgid "patterns match after any '/' (default for exclusion)" -msgstr "los patrones de exclusión encajan después de cualquier / (por omisión)" +msgstr "" +"los patrones de exclusión encajan después de cualquier `/' (por omisión)" -#: src/tar.c:769 +#: src/tar.c:801 #, fuzzy msgid "case sensitive matching (default)" -msgstr "la exclusión distingue mayúsculas de minúsculas (por omisión)" +msgstr "la exclusión distingue mayúsculas de minúsculas (por omisión)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" -msgstr "" +msgstr "utiliza comodines (predeterminado para exclusión)" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "" -#: src/tar.c:775 +#: src/tar.c:807 #, fuzzy msgid "wildcards do not match '/'" -msgstr "los comodines de patrones de exclusión no encajan con '/'" +msgstr "los comodines de patrones de exclusión no encajan con `/'" -#: src/tar.c:777 +#: src/tar.c:809 #, fuzzy msgid "wildcards match '/' (default for exclusion)" msgstr "" -"los comodines de los patrones de exclusión encajan con '/' (por omisión)" +"los comodines de los patrones de exclusión encajan con `/' (por omisión)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Salida informativa:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "lista los ficheros procesados detalladamente" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "" -#: src/tar.c:789 +#: src/tar.c:821 #, fuzzy msgid "display progress messages every NUMBERth record (default 10)" msgstr "muestra mensajes de progreso cada 10 registros" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" -msgstr "" +msgstr "ACCIÓN" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" -msgstr "" +msgstr "ejecuta ACCIÓN en cada punto de comprobación" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "muestra un mensaje si no se vuelcan todos los enlaces" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" -msgstr "" +msgstr "SEÑAL" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2500,481 +2506,461 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:802 +#: src/tar.c:834 #, fuzzy msgid "print file modification times in UTC" -msgstr "muestra las fechas de modificación de los ficheros en UTC" +msgstr "muestra las fechas de modificación de los ficheros en UTC" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" -msgstr "" +msgstr "muestra la fecha del fichero con la máxima resolución" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" -msgstr "envía la salida detallada a FICHERO" +msgstr "envía la salida detallada a FICHERO" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" -msgstr "muestra el número de bloque dentro del archivo con cada mensaje" +msgstr "muestra el número de bloque dentro del archivo con cada mensaje" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" -msgstr "pide confirmación para cada acción" +msgstr "pide confirmación para cada acción" -#: src/tar.c:813 -#, fuzzy +#: src/tar.c:845 msgid "show tar defaults" -msgstr "Muestra los valores predeterminados de tar" +msgstr "muestra los valores predeterminados de tar" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 -#, fuzzy +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -"Cuando se lista o extrae, lista cada directorio que no coincida con el " -"criterio de búsqueda" +"cuando se lista o extrae, lista cada directorio que no coincida con el " +"criterio de búsqueda" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "Opciones de compatibilidad:" -#: src/tar.c:835 -#, fuzzy +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -"al crear, lo mismo que --old-archive. Al extraer, lo mismo que --no-same-" +"al crear, lo mismo que --old-archive; al extraer, lo mismo que --no-same-" "owner" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "Otras opciones:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" -msgstr "" +msgstr "desactivo el uso de algunas opciones potencialmente peligrosas" -#: src/tar.c:978 -#, fuzzy +#: src/tar.c:1010 msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" -msgstr "No se puede especificar más de una opción `-Acdtrux'" +msgstr "" +"No se puede especificar más de una opción `-Acdtrux', '--delete' o '--test-" +"label'" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" -msgstr "Opciones de compresión en conflicto" +msgstr "Opciones de compresión en conflicto" -#: src/tar.c:1047 -#, fuzzy, c-format +#: src/tar.c:1079 +#, c-format msgid "Unknown signal name: %s" -msgstr " tipo de fichero desconocido %s\n" +msgstr "Nombre de señal desconocido: %s" -#: src/tar.c:1071 -#, fuzzy +#: src/tar.c:1103 msgid "Date sample file not found" -msgstr "No se encontró la fecha del fichero" +msgstr "No se encontró el fichero de fechas de muestra" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Sustituyendo %s por el formato de fecha desconocido %s" -#: src/tar.c:1108 -#, fuzzy, c-format +#: src/tar.c:1140 +#, c-format msgid "Option %s: Treating date '%s' as %s" -msgstr "Se trata la fecha `%s' como %s + %ld nanosegundo" +msgstr "Opción %s: Se trata la fecha '%s' como %s" -# FIXME: Decir al autor que ponga el "itself". sv -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 -#, fuzzy, c-format +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 +#, c-format msgid "filter the archive through %s" -msgstr "filtra el arhivo a través de gzip" +msgstr "filtra el archivo a través de %s" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" -msgstr "" +msgstr "Los argumentos válidos para la opción --quoting-style son:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" "\n" -"Las opciones predeterminadas de *esta* versión de tar son:\n" +"Las opciones predeterminadas de *esta* versión de tar son:\n" -#: src/tar.c:1295 -#, fuzzy +#: src/tar.c:1330 msgid "Invalid owner or group ID" -msgstr "Propietario inválido" +msgstr "ID de propietario o de grupo inválido" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" -msgstr "Factor de bloqueo inválido" +msgstr "Factor de bloqueo inválido" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" -msgstr "Longitud de cinta inválida" +msgstr "Longitud de cinta inválida" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "" -# No sé cómo traducir threshold. fr +# No sé cómo traducir threshold. fr # Yo tampoco (los diccionarios los tengo en casa...). sv -# Lo buscaré en un diccionario "güeno". fr -# Es "umbral", pero no sé qué c$%&# es la fecha umbral. :-( gag -# A ver si te vale así. sv -# ¿Qué tal os suena "fecha límite"?. jmg -#: src/tar.c:1512 +# Lo buscaré en un diccionario "güeno". fr +# Es "umbral", pero no sé qué c$%&# es la fecha umbral. :-( gag +# A ver si te vale así. sv +# ¿Qué tal os suena "fecha límite"?. jmg +#: src/tar.c:1567 msgid "More than one threshold date" -msgstr "Se ha especificado más de una fecha tope" +msgstr "Se ha especificado más de una fecha tope" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" -msgstr "Se ha especificado un modo no válido en la opción" +msgstr "Se ha especificado un modo no válido en la opción" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" -msgstr "Número inválido" +msgstr "Número inválido" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" +"La opción --preserve está obsoleta, utilice --preserve-permissions --" +"preserve-order en su lugar" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" -msgstr "El tamaño del registro es inválido" +msgstr "El tamaño del registro es inválido" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." -msgstr "El tamaño del registro debe ser múltiplo de %d." +msgstr "El tamaño del registro debe ser múltiplo de %d." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" -msgstr "Número inválido de elementos" +msgstr "Número inválido de elementos" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" -msgstr "" +msgstr "Solamente se permite una opción --to-command" -#: src/tar.c:2107 -#, fuzzy, c-format +#: src/tar.c:2179 +#, c-format msgid "Malformed density argument: %s" -msgstr "Argumento de densidad mal formado: '%s'" +msgstr "Argumento de densidad mal formado: %s" -#: src/tar.c:2133 -#, fuzzy, c-format +#: src/tar.c:2205 +#, c-format msgid "Unknown density: '%c'" msgstr "Densidad desconocida: '%c'" -#: src/tar.c:2150 -#, fuzzy, c-format +#: src/tar.c:2222 +#, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" -msgstr "*Esta* versión de tar no admite las opciones `-[0-7][lmh]'" +msgstr "*Esta* versión de tar no admite las opciones '-[0-7][lmh]'" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[FICHERO]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 #, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "la opción --%s no se puede usar con %s" + +#: src/tar.c:2389 +#, c-format msgid "Old option '%c' requires an argument." -msgstr "La opción antigua `%c' requiere un argumento" +msgstr "La opción antigua '%c' requiere un argumento" -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence no tiene sentido sin una lista de ficheros" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "no se puede usar --occurrence en el modo de operación solicitado" - # requieren -> necesitan. gerardo -#: src/tar.c:2408 -#, fuzzy +#: src/tar.c:2490 msgid "Multiple archive files require '-M' option" -msgstr "Los archivos múltiples requieren la opción `-M'" - -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "No se puede combinar --listed-incremental con --newer" +msgstr "Los archivos múltiples requieren la opción '-M'" -#: src/tar.c:2416 -#, fuzzy +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" -msgstr "--occurrence no tiene sentido sin una lista de ficheros" +msgstr "--level no tiene sentido sin --listed-incremental" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "" -"%s: La etiqueta de volumen es demasiado larga (el límite es %lu byte)" +"%s: La etiqueta de volumen es demasiado larga (el límite es %lu byte)" msgstr[1] "" -"%s: La etiqueta de volumen es demasiado larga (el límite es %lu bytes)" +"%s: La etiqueta de volumen es demasiado larga (el límite es %lu bytes)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "No se pueden verificar archivos multivolumen" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "No se pueden verificar archivos comprimidos" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "No se puede usar el patrón %s" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "No se pueden utilizar archivos multivolumen comprimidos" -#: src/tar.c:2461 -#, fuzzy +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" -msgstr "No se pueden actualizar archivos comprimidos" +msgstr "No se pueden concatenar archivos comprimidos" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option solamente se puede usar en archivos POSIX" -#: src/tar.c:2478 -#, fuzzy +#: src/tar.c:2560 msgid "--acls can be used only on POSIX archives" -msgstr "--pax-option solamente se puede usar en archivos POSIX" +msgstr "--acls solamente se puede usar en archivos POSIX" -#: src/tar.c:2483 -#, fuzzy +#: src/tar.c:2565 msgid "--selinux can be used only on POSIX archives" -msgstr "--pax-option solamente se puede usar en archivos POSIX" +msgstr "--selinux solamente se puede usar en archivos POSIX" -#: src/tar.c:2488 -#, fuzzy +#: src/tar.c:2570 msgid "--xattrs can be used only on POSIX archives" -msgstr "--pax-option solamente se puede usar en archivos POSIX" - -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "No se puede usar el patrón %s" +msgstr "--xattrs solamente se puede usar en archivos POSIX" -#: src/tar.c:2525 -msgid "Volume length cannot be less than record size" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" msgstr "" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "" +#: src/tar.c:2630 +msgid "Volume length cannot be less than record size" +msgstr "La longitud del volumen no puede ser menor que el tamaño de registro" -# Me gusta más al verrés: cobarde rechazo [de la pradera] a... gerardo -#: src/tar.c:2539 +# Me gusta más al verrés: cobarde rechazo [de la pradera] a... gerardo +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" -msgstr "Rechazo cobarde a crear un archivo vacío" +msgstr "Rechazo cobarde a crear un archivo vacío" -#: src/tar.c:2565 -#, fuzzy +#: src/tar.c:2669 msgid "Options '-Aru' are incompatible with '-f -'" -msgstr "Las opciones `-Aru' son incompatibles con `-f -'" +msgstr "Las opciones '-Aru' son incompatibles con '-f -'" -#: src/tar.c:2660 -#, fuzzy +#: src/tar.c:2766 msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" -msgstr "Debe especificar una de las opciones `-Acdtrux'" +msgstr "" +"Debe especificar una de las opciones `-Acdtrux', '--delete' o '--test-label'" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" -msgstr "" +msgstr "Se sale con estado de fallo debido a errores anteriores" -# Eso de ¡vaya tela! ¿es una interjección que se entiende en todo el mundo -# hispanoparlante? No vaya a ser específico de Andalucía/Extremadura y... -# ¡oye, déjalo, así expandimos nuestra lengua! gerardo -# Inaceptable, alguien fuera de España no tiene idea de que diablos quiere -# decir ¡vaya tela!. Habrá que buscar alguna interhección de asco/sorpresa -# que sea más `portable'. nl -# Tenéis razón. Habrá que preguntar. -# ¡Ya lo tengo! "¡Carajo!" X-D Eso se utiliza en Colombia, México y otros -# sitios de por ahí a troche y moche, y creo que ni siquiera se entiende como -# "miembro viril masculino". Y en España creo que también se emplea, ¿no? -# (Vaale, vaaale, ¿y qué tal su eufemismo `caramba' o `caray', más neutros -# y cursis, para que no se enfade nadie? Aunque para cursis: `cáspita', -# `caracoles', `cónchales'; no diréis que no os doy opciones.) Por cierto, +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + +# Eso de ¡vaya tela! ¿es una interjección que se entiende en todo el mundo +# hispanoparlante? No vaya a ser específico de Andalucía/Extremadura y... +# ¡oye, déjalo, así expandimos nuestra lengua! gerardo +# Inaceptable, alguien fuera de España no tiene idea de que diablos quiere +# decir ¡vaya tela!. Habrá que buscar alguna interhección de asco/sorpresa +# que sea más `portable'. nl +# Tenéis razón. Habrá que preguntar. +# ¡Ya lo tengo! "¡Carajo!" X-D Eso se utiliza en Colombia, México y otros +# sitios de por ahí a troche y moche, y creo que ni siquiera se entiende como +# "miembro viril masculino". Y en España creo que también se emplea, ¿no? +# (Vaale, vaaale, ¿y qué tal su eufemismo `caramba' o `caray', más neutros +# y cursis, para que no se enfade nadie? Aunque para cursis: `cáspita', +# `caracoles', `cónchales'; no diréis que no os doy opciones.) Por cierto, # creo que la coma sobra (incluso en el original). gerardo #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" msgid_plural "%s: File shrank by %s bytes" -msgstr[0] "%s: El tamaño del fichero ha disminuido en %s byte" -msgstr[1] "%s: El tamaño del fichero ha disminuido en %s bytes" +msgstr[0] "%s: El tamaño del fichero ha disminuido en %s byte" +msgstr[1] "%s: El tamaño del fichero ha disminuido en %s bytes" -# FIXME: Imlemented -#: src/xheader.c:164 -#, fuzzy, c-format +#: src/xheader.c:165 +#, c-format msgid "Keyword %s is unknown or not yet implemented" -msgstr "La palabra clave %s es desconocida o no está implementada todavía" +msgstr "La palabra clave %s es desconocida o no está implementada todavía" -#: src/xheader.c:173 -#, fuzzy +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" -msgstr "Marca de tiempo fuera de rango" +msgstr "La marca de tiempo está fuera del rango permitido" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" -msgstr "No se puede usar el patrón %s" +msgstr "No se puede usar el patrón %s" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "La palabra clave %s no se puede sustituir" -#: src/xheader.c:667 -#, fuzzy +#: src/xheader.c:668 msgid "Malformed extended header: missing length" -msgstr "Cabecera extendida errónea: falta un signo igual" +msgstr "Cabecera extendida errónea: falta la longitud" -#: src/xheader.c:676 -#, fuzzy, c-format +#: src/xheader.c:677 +#, c-format msgid "Extended header length %*s is out of range" -msgstr "La cadena firmada en base 64 %s del archivo está fuera del rango %s" +msgstr "La longitud de cabecera extendida %*s está fuera de rango" -#: src/xheader.c:688 +#: src/xheader.c:689 #, fuzzy msgid "Malformed extended header: missing blank after length" msgstr "" -"Cabecera extendida errónea: falta un espacio en blanco después de la longitud" +"Cabecera extendida errónea: falta un espacio en blanco después de la longitud" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" -msgstr "Cabecera extendida errónea: falta un signo igual" +msgstr "Cabecera extendida errónea: falta un signo igual" -#: src/xheader.c:702 -#, fuzzy +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" -msgstr "Cabecera extendida errónea: falta un signo igual" +msgstr "Cabecera extendida errónea: falta una nueva línea" -#: src/xheader.c:740 +#: src/xheader.c:741 #, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, fuzzy, c-format msgid "Extended header %s=%s is out of range %s..%s" -msgstr "El valor del archivo %s está fuera del rango %s %s.%s" +msgstr "El valor del archivo %s está fuera del rango %s %s.%s" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, fuzzy, c-format msgid "Malformed extended header: invalid %s=%s" -msgstr "Cabecera extendida errónea: falta un signo igual" +msgstr "Cabecera extendida errónea: falta un signo igual" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, fuzzy, c-format msgid "Malformed extended header: excess %s=%s" -msgstr "Cabecera extendida errónea: falta un signo igual" +msgstr "Cabecera extendida errónea: falta un signo igual" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, fuzzy, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" -msgstr "Cabecera extendida errónea: falta un signo igual" +msgstr "Cabecera extendida errónea: falta un signo igual" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, fuzzy, c-format msgid "Malformed extended header: invalid %s: odd number of values" -msgstr "Cabecera extendida errónea: falta un signo igual" +msgstr "Cabecera extendida errónea: falta un signo igual" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, fuzzy, c-format msgid "%s: not a valid timeout" -msgstr "%s: Grupo inválido" +msgstr "%s: Grupo inválido" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" -msgstr "" +msgstr "escritura" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" -msgstr "" +msgstr "lectura" #. TRANSLATORS: This is a "checkpoint of write operation", #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 -#, fuzzy, c-format +#: src/checkpoint.c:218 +#, c-format msgid "Write checkpoint %u" -msgstr "Punto de comprobación de escritura %d" +msgstr "Punto de comprobación de escritura %u" #. TRANSLATORS: This is a "checkpoint of read operation", #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 -#, fuzzy, c-format +#: src/checkpoint.c:224 +#, c-format msgid "Read checkpoint %u" -msgstr "Punto de comprobación de lectura %d" +msgstr "Punto de comprobación de lectura %u" # Acepto sugerencias para el `test suite'. sv -# "test suite"="paquete/conjunto de pruebas/análisis", en cualquier -# combinación. jmg +# "test suite"="paquete/conjunto de pruebas/análisis", en cualquier +# combinación. jmg #: tests/genfile.c:111 #, fuzzy msgid "" @@ -2983,37 +2969,32 @@ msgid "" msgstr "Genera ficheros de datos para el conjunto de pruebas de GNU tar.\n" #: tests/genfile.c:127 -#, fuzzy msgid "File creation options:" -msgstr "Otras opciones:" +msgstr "Opciones de creación de ficheros:" #: tests/genfile.c:128 tests/genfile.c:139 msgid "SIZE" -msgstr "" +msgstr "TAMAÑO" #: tests/genfile.c:129 -#, fuzzy msgid "Create file of the given SIZE" -msgstr "crea un archivo en el formato dado." +msgstr "Crea un fichero del TAMAÑO dado" #: tests/genfile.c:131 -#, fuzzy msgid "Write to file NAME, instead of standard output" -msgstr "extrae los ficheros a la salida estándar" +msgstr "Escribe al fichero NOMBRE; en lugar de a la salida estándar" #: tests/genfile.c:133 -#, fuzzy msgid "Read file names from FILE" -msgstr "Leídos %s bytes como %s" +msgstr "Lee los nombres de los ficheros de FICHERO" #: tests/genfile.c:135 -#, fuzzy msgid "-T reads null-terminated names" -msgstr "-T lee nombres terminados en nulo, desactiva -C" +msgstr "-T lee nombres terminados en nulo" #: tests/genfile.c:137 msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'" -msgstr "" +msgstr "Rellena el fichero con el PATRÓN dado, PATRÓN es 'default' o 'zeros'" #: tests/genfile.c:140 msgid "Size of a block for sparse file" @@ -3030,7 +3011,7 @@ msgstr "" #: tests/genfile.c:145 #, fuzzy msgid "Seek to the given offset before writing data" -msgstr "intenta verificar el archivo después de escribirlo" +msgstr "intenta verificar el archivo después de escribirlo" #: tests/genfile.c:151 msgid "File statistics options:" @@ -3045,9 +3026,8 @@ msgid "Synchronous execution options:" msgstr "" #: tests/genfile.c:163 -#, fuzzy msgid "OPTION" -msgstr " [OPCIÓN...]" +msgstr "OPCIÓN" #: tests/genfile.c:164 msgid "" @@ -3061,7 +3041,7 @@ msgstr "" #: tests/genfile.c:170 msgid "Set date for next --touch option" -msgstr "" +msgstr "Establece la fecha para la siguiente opción --touch" #: tests/genfile.c:173 msgid "Display executed checkpoints and exit status of COMMAND" @@ -3084,38 +3064,36 @@ msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option." msgstr "" #: tests/genfile.c:188 -#, fuzzy msgid "Update the access and modification times of FILE" -msgstr "%s: No se pueden cambiar las fechas de acceso y modificación" +msgstr "Actualiza las fechas de acceso y modificación de FICHERO" #: tests/genfile.c:191 -#, fuzzy msgid "Execute COMMAND" -msgstr "ORDEN" +msgstr "Ejecuta ORDEN" #: tests/genfile.c:194 msgid "Unlink FILE" -msgstr "" +msgstr "Desenlaza FICHERO" #: tests/genfile.c:244 -#, fuzzy, c-format +#, c-format msgid "Invalid size: %s" -msgstr "Marca de tiempo inválida" +msgstr "Tamaño inválido: %s" #: tests/genfile.c:249 -#, fuzzy, c-format +#, c-format msgid "Number out of allowed range: %s" -msgstr "Número de nodo-i fuera de rango" +msgstr "Número fuera del rango permitido: %s" #: tests/genfile.c:252 #, c-format msgid "Negative size: %s" -msgstr "" +msgstr "Tamaño negativo: %s" #: tests/genfile.c:265 tests/genfile.c:569 #, c-format msgid "stat(%s) failed" -msgstr "" +msgstr "stat(%s) ha fallado" #: tests/genfile.c:268 #, c-format @@ -3133,29 +3111,28 @@ msgid "Error parsing number near `%s'" msgstr "" #: tests/genfile.c:367 -#, fuzzy, c-format +#, c-format msgid "Unknown date format" -msgstr "Error del sistema desconocido" +msgstr "Formato de fecha desconocido" #: tests/genfile.c:391 msgid "[ARGS...]" -msgstr "" +msgstr "[ARGUMENTOS...]" #: tests/genfile.c:428 tests/genfile.c:468 tests/genfile.c:523 #: tests/genfile.c:673 tests/genfile.c:687 -#, fuzzy, c-format +#, c-format msgid "cannot open `%s'" -msgstr "No se puede abrir %s" +msgstr "No se puede abrir `%s'" #: tests/genfile.c:434 -#, fuzzy msgid "cannot seek" -msgstr "No se puede cerrar" +msgstr "no se puede efectuar `seek'" #: tests/genfile.c:451 #, c-format msgid "file name contains null character" -msgstr "" +msgstr "el nombre del fichero contiene el carácter nulo" #: tests/genfile.c:518 #, c-format @@ -3168,1049 +3145,79 @@ msgid "incorrect mask (near `%s')" msgstr "" #: tests/genfile.c:602 tests/genfile.c:635 -#, fuzzy, c-format +#, c-format msgid "Unknown field `%s'" -msgstr " tipo de fichero desconocido %s\n" +msgstr "Campo desconocido `%s'" # Uff, a lo mejor se asusta el usuario si ponemos 'no se pudo leer con stat() # el estado del fichero em+ -# stat() es una primitiva Unix que acaba de fallar; también podría +# stat() es una primitiva Unix que acaba de fallar; también podría # ser: "No se puede hacer stat() del fichero %s", o "stat() ha fallado..." -# Aunque tal como está es más descriptivo para el neófito, desde +# Aunque tal como está es más descriptivo para el neófito, desde # luego. gag #: tests/genfile.c:662 -#, fuzzy, c-format +#, c-format msgid "cannot set time on `%s'" -msgstr "No se puede leer el estado del fichero %s" +msgstr "no se puede establecer la fecha sobre `%s'" #: tests/genfile.c:692 -#, fuzzy, c-format +#, c-format msgid "cannot truncate `%s'" -msgstr "No se puede abrir %s" +msgstr "no se puede truncar `%s'" #: tests/genfile.c:701 -#, fuzzy, c-format +#, c-format msgid "command failed: %s" -msgstr "La orden `%s' falló" +msgstr "la orden falló: %s" #: tests/genfile.c:706 -#, fuzzy, c-format +#, c-format msgid "cannot unlink `%s'" -msgstr "No se puede abrir %s" +msgstr "no se puede desenlazar `%s'" #: tests/genfile.c:833 #, c-format msgid "Command exited successfully\n" -msgstr "" +msgstr "La orden terminó con éxito\n" #: tests/genfile.c:835 -#, fuzzy, c-format +#, c-format msgid "Command failed with status %d\n" -msgstr "El proceso hijo terminó con la señal %d" +msgstr "La orden falló con el estado %d\n" #: tests/genfile.c:839 #, c-format msgid "Command terminated on signal %d\n" -msgstr "" +msgstr "La orden terminó con la señal %d\n" #: tests/genfile.c:841 #, c-format msgid "Command stopped on signal %d\n" -msgstr "" +msgstr "La orden se detuvo con la señal %d\n" #: tests/genfile.c:844 #, c-format msgid "Command dumped core\n" -msgstr "" +msgstr "La orden volcó un core\n" #: tests/genfile.c:847 #, c-format msgid "Command terminated\n" -msgstr "" +msgstr "La orden terminó\n" #: tests/genfile.c:879 -#, fuzzy, c-format +#, c-format msgid "--stat requires file names" -msgstr "--Nombres de fichero modificados--\n" - -#, fuzzy -#~ msgid "Cannot get working directory" -#~ msgstr "No se puede cambiar el directorio de trabajo" - -#~ msgid "sort names to extract to match archive" -#~ msgstr "ordena los nombres que se extraen para que coincidan con el archivo" - -#, fuzzy -#~ msgid "Read error in snapshot file" -#~ msgstr "Error de lectura en %s" - -#, fuzzy -#~ msgid "Invalid group" -#~ msgstr "%s: Grupo inválido" - -#, fuzzy -#~ msgid "%s: Directory removed before we read it" -#~ msgstr "%s: El fichero fue borrado antes de leerlo" - -#, fuzzy -#~ msgid "Cannot restore working directory" -#~ msgstr "No se puede guardar el directorio de trabajo" - -#, fuzzy -#~ msgid "Cannot resolve hostname %s" -#~ msgstr "%s: No se puede renombrar a %s" - -#~ msgid "%s: illegal option -- %c\n" -#~ msgstr "%s: opción ilegal -- %c\n" - -#~ msgid "Reading %s\n" -#~ msgstr "Leyendo %s\n" - -# Por favor, no me digáis cómo se traduce bug. -# Gerardo lo ha visto traducido en un libro como "pulgas", y yo -# lo he visto como "chinche" en la "Investigación y Ciencia". -# Está claro que así no vamos a ninguna parte. -# Yo diría simplemente `fallos [ocultos]'. Es lo que significa, en realidad, -# en el contexto informático, razones históricas aparte de bichos anidando -# al calorcito de los tubos de vacío de los primeros computadores. gerardo -# De "ocultos" nada... Este vamos a dejarlo, ¿vale? sv -# Tú mandas, pero ¿cómo que de ocultos nada? Si no fueran ocultos, el progra- -# ma no vería la luz aún, ¿no? Pero observa que he puesto el `ocultos' entre -# corchetes. Yo pondría "bug -> fallo" simplemente. Comunicar fallos a... gerardo -# ¿Que no vería la luz si no fueran ocultos? Ja, ja, ja, ja... -# Mira por ejemplo en http://nl.debian.org/Bugs. -# ¿No tendría sentido catalogarlos entonces? -# -# Véase "A Bug's life". -#~ msgid "" -#~ "\n" -#~ "Report bugs to <%s>.\n" -#~ msgstr "" -#~ "\n" -#~ "Comunicar bichos a <%s>.\n" - -#~ msgid "filter the archive through bzip2" -#~ msgstr "filtra el archivo a través de bzip2" - -# FIXME: Decir al autor que ponga el "itself". sv -#~ msgid "filter the archive through gzip" -#~ msgstr "filtra el arhivo a través de gzip" - -# FIXME: Decir al autor que ponga el "itself". sv -#~ msgid "filter the archive through compress" -#~ msgstr "filtra el archivo a través de compress" - -# FIXME: Decir al autor que ponga el "itself". sv -#, fuzzy -#~ msgid "filter the archive through lzma" -#~ msgstr "filtra el arhivo a través de gzip" - -# FIXME: Decir al autor que ponga el "itself". sv -#, fuzzy -#~ msgid "filter the archive through lzop" -#~ msgstr "filtra el arhivo a través de gzip" - -#~ msgid "rmtd: Cannot allocate buffer space\n" -#~ msgstr "rmtd: No se puede asignar espacio para el búfer\n" - -#~ msgid "Cannot allocate buffer space" -#~ msgstr "No se puede asignar espacio para el búfer" - -#~ msgid "Try `%s --help' for more information.\n" -#~ msgstr "Pruebe `%s --help' para más información.\n" - -#, fuzzy -#~ msgid "" -#~ "Usage: %s [OPTION]\n" -#~ "Manipulate a tape drive, accepting commands from a remote process.\n" -#~ "\n" -#~ " --version Output version info.\n" -#~ " --help Output this help.\n" -#~ msgstr "" -#~ "Modo de empleo: %s [OPCIÓN]\n" -#~ "Manipula una unidad de cinta, aceptando órdenes de un proceso remoto.\n" -#~ "\n" -#~ " --version Muestra la versión.\n" -#~ " --help Muestra esta ayuda.\n" - -#, fuzzy -#~ msgid "Seek offset error" -#~ msgstr "Desplazamiento fuera de rango" - -#~ msgid "Premature end of file" -#~ msgstr "Fin de fichero prematuro" - -#~ msgid "Error is not recoverable: exiting now" -#~ msgstr "El error no es recuperable: salida ahora" - -#~ msgid "block size" -#~ msgstr "tamaño del bloque" - -#~ msgid "" -#~ "This program comes with NO WARRANTY, to the extent permitted by law.\n" -#~ "You may redistribute it under the terms of the GNU General Public " -#~ "License;\n" -#~ "see the file named COPYING for details." -#~ msgstr "" -#~ "Este programa viene sin NINGUNA GARANTÍA, hasta donde permite la ley.\n" -#~ "Puede redistribuirse bajo los términos de la Licencia Pública General de " -#~ "GNU;\n" -#~ "vea el fichero llamado COPYING para más información." - -# "no reconocida" me parecía muy suave para "garbage". sv -# OJO: Casi el mismo mensaje. -#~ msgid "rmtd: Garbage command %c\n" -#~ msgstr "rmtd: Orden ininteligible %c\n" - -#~ msgid "WARNING: No volume header" -#~ msgstr "ATENCIÓN: No hay cabecera de volumen" - -# Me queda la duda de si lo que es visible es el error o el nombre largo... sv -#~ msgid "Visible long name error" -#~ msgstr "Error de nombre largo visible" - -#~ msgid "Device number out of range" -#~ msgstr "Número de dispositivo fuera de rango" - -# FIXME. Hay otro que se parece muchísimo. sv -#~ msgid "Visible longname error" -#~ msgstr "Error de nombre largo visible" - -#~ msgid "Renamed %s to %s" -#~ msgstr "Se renombra %s como %s" - -#~ msgid "%s: Cannot symlink to %s" -#~ msgstr "%s: No se puede crear un enlace simbólico a %s" - -#~ msgid "Symlinked %s to %s" -#~ msgstr "Se enlaza %s simbólicamente a %s" - -# ¿desmutilador? sv. (Perdona mi ignorancia: ¿qué significa?) -# No lo sé, tengo que consultar. Lo encontré en un diccionario raro. fr -# Bueno, yo tampoco sé lo que es, pero "mangling" me suena a: -# "proceso mediante el cual se codifican ciertos nombres de cierta manera." -# Por ejemplo, "name mangling" es lo que hace Linux cuando se instala -# con umsdos. (¿Lo has visto alguna vez?). -# También se habla de "mangling" a la forma que tiene el C++ de incluir -# los nombres de las funciones (o de las clases quizá) en un archivo -# objeto ( .o ). -# Bueno, en realidad no lo sé, pero espero haberte dado alguna idea. -# A ver qué dice Enrique u otro revisor. sv -# Sigo en blanco. fr -# La traducción mas acertada creo que es esta :) , el uso que conozco -# de mangled esta relacionado con codificar o transformar el nombre de una -# función C++ dentro de una biblioteca, de manera que se pueda deshacer la -# referencia a la función al compilar o enlazar dinámicamente, obteniendo -# la función que corresponde al aplicar la sobrecarga de operadores. em+ -# # Todo eso es así, lo malo es encontrar la palabra simple más -# # adecuada y mantenerla. Por ejemplo, antes hemos dicho "mutilar", en -# # otros mensajes; y ahora "desenredar". -#~ msgid "Unknown demangling command %s" -#~ msgstr "Orden desconocida para recuperar el nombre original de %s" - -#~ msgid "Missing file name after -C" -#~ msgstr "Falta el nombre del fichero después de -C" - -#~ msgid "don't change access times on dumped files" -#~ msgstr "no cambia la fecha de acceso en los ficheros volcados" - -#~ msgid "extract permissions information" -#~ msgstr "extrae la información de los permisos" - -#~ msgid "do not extract permissions information" -#~ msgstr "no extrae la información de los permisos" - -#~ msgid "FILE-OF-NAMES" -#~ msgstr "FICHERO-DE-NOMBRES" - -#~ msgid "exclude patterns are plain strings" -#~ msgstr "los patrones de exclusión son cadenas normales" - -#~ msgid "dump instead the files symlinks point to" -#~ msgstr "" -#~ "vuelca los ficheros a los que apuntan los enlaces simbólicos, en lugar de " -#~ "los enlaces" - -#~ msgid "same as -N" -#~ msgstr "lo mismo que -N" - -#~ msgid "exclude patterns use wildcards (default)" -#~ msgstr "los patrones de exclusión usan comodines (por omisión)" - -#~ msgid "print total bytes written while creating archive" -#~ msgstr "muestra el total de bytes escritos cuando se crea un archivo" - -#~ msgid "Print license and exit" -#~ msgstr "Muestra la licencia y finaliza" - -#~ msgid "" -#~ "Based on the work of John Gilmore and Jay Fenlason. See AUTHORS\n" -#~ "for complete list of authors.\n" -#~ msgstr "" -#~ "Basado en el trabajo de John Gilmore y Jay Fenlason. Vea AUTHORS\n" -#~ "para una lista completa de autores.\n" - -#~ msgid "" -#~ " GNU tar is free software; you can redistribute it and/or modify\n" -#~ " it under the terms of the GNU General Public License as published by\n" -#~ " the Free Software Foundation; either version 2 of the License, or\n" -#~ " (at your option) any later version.\n" -#~ "\n" -#~ " GNU tar is distributed in the hope that it will be useful,\n" -#~ " but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -#~ " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -#~ " GNU General Public License for more details.\n" -#~ "\n" -#~ " You should have received a copy of the GNU General Public License\n" -#~ " along with GNU tar; if not, write to the Free Software\n" -#~ " Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 " -#~ "USA\n" -#~ "\n" -#~ msgstr "" -#~ " GNU tar es software libre; puede redistribuirse y/o modificarse\n" -#~ " bajo los términos de la Licencia Pública General de GNU tal y como\n" -#~ " se publica por la Free Software Foundation; bien en la versión 2\n" -#~ " de la Licencia, o (a su elección) cualquier versión posterior.\n" -#~ "\n" -#~ " GNU tar se distribuye con la esperanza de que sea útil, pero\n" -#~ " SIN NINGUNA GARANTÍA; ni siquiera la garantía implícita de\n" -#~ " COMERCIABILIDAD o IDONEIDAD PARA UN FIN DETERMINADO. Véase la\n" -#~ " Licencia Pública General de GNU para más detalles.\n" -#~ "\n" -#~ " Usted debería haber recibido una copia de la Licencia Pública General\n" -#~ " de GNU junto con GNU tar; en caso contrario, escriba a la Free " -#~ "Software\n" -#~ " Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 EE." -#~ "UU.\n" - -#~ msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" -#~ msgstr "Atención: no se admite la opción -I; ¿no será -j o -T?" - -#~ msgid "Semantics of -l option will change in the future releases." -#~ msgstr "El significado de la opción -l cambiará en versiones posteriores." - -#~ msgid "Please use --one-file-system option instead." -#~ msgstr "Por favor utilice la opción --one-file-system en su lugar." - -#~ msgid "Warning: the -y option is not supported; perhaps you meant -j?" -#~ msgstr "Atención: no se admite la opción -y; ¿no será -j?" - -#~ msgid "Error in writing to standard output" -#~ msgstr "Error al escribir en la salida estándar" - -# Antes decía: -# "La salida con error se demora por los errores anteriores -# -# Quiere decir que hubo errores, pero tar pudo seguir adelante, sin -# embargo va a salir con un estado de error por esos errores que ya pasaron. -# Una traducción: -# "Salida con error demorada desde errores anteriores" (Nicolás L.) -#~ msgid "Error exit delayed from previous errors" -#~ msgstr "Salida con error demorada desde errores anteriores" - -# Sugerencia: para archivos -> para los archivos. sv -# Sugerencia: Estandarizar la traducción de "added files". sv -# En el --mode=CHANGES no sé qué poner... sv -# En vez de "force"->"establece", yo dejaría el significado -# original ->"fuerza". jmg -# force es forzar, ¡no establecer! nl -# Gerardo, ¿qué opinas de "forzar"? sv -# Hombre, desde luego to force es forzar u obligar; la verdad es que no sé -# por qué el autor original dice "force" y no "set". Quizá porque si no se -# pusieran estas opciones los ficheros tendrían otros atributos que vendrían -# impuestos por el umask, el UID/GID del usuario, etc., y con esto se "fuerza", -# se cambia esta situación. No es lo mismo que establecer, que sería poner -# esos atributos partiendo de cero. Creo que ése es el matiz, y para conservar- -# lo habría que poner "fuerza NOMBRE como propietario...", etc., o bien -# "obliga a que sea NOMBRE el propietario...", etc. gerardo -# # usa -> emplea - gerardo -#~ msgid "" -#~ "\n" -#~ "Handling of file attributes:\n" -#~ " --owner=NAME force NAME as owner for added files\n" -#~ " --group=NAME force NAME as group for added files\n" -#~ " --mode=CHANGES force (symbolic) mode CHANGES for added " -#~ "files\n" -#~ " --atime-preserve don't change access times on dumped files\n" -#~ " -m, --modification-time don't extract file modified time\n" -#~ " --same-owner try extracting files with the same " -#~ "ownership\n" -#~ " --no-same-owner extract files as yourself\n" -#~ " --numeric-owner always use numbers for user/group names\n" -#~ " -p, --same-permissions extract permissions information\n" -#~ " --no-same-permissions do not extract permissions information\n" -#~ " --preserve-permissions same as -p\n" -#~ " -s, --same-order sort names to extract to match archive\n" -#~ " --preserve-order same as -s\n" -#~ " --preserve same as both -p and -s\n" -#~ msgstr "" -#~ "\n" -#~ "Manejo de los atributos de los ficheros:\n" -#~ " --owner=NOMBRE establece NOMBRE como propietario para " -#~ "los\n" -#~ " ficheros que se añaden\n" -#~ " --group=NOMBRE establece NOMBRE como grupo para los " -#~ "ficheros que\n" -#~ " se añaden\n" -#~ " --mode=CAMBIOS establece CAMBIOS como modo (simbólico) " -#~ "para los\n" -#~ " ficheros que se añaden\n" -#~ " --atime-preserve no cambia la fecha de acceso en los " -#~ "ficheros\n" -#~ " volcados\n" -#~ " -m, --modification-time no extrae la fecha de modificación de " -#~ "ficheros\n" -#~ " --same-owner intenta extraer ficheros con el mismo " -#~ "propietario\n" -#~ " --no-same-owner extrae los ficheros como uno mismo\n" -#~ " --numeric-owner siempre utiliza números para nombres de\n" -#~ " usuario/grupo\n" -#~ " -p, --same-permissions extrae la información de los permisos\n" -#~ " --no-same-permissions no extrae la información de los permisos\n" -#~ " --preserve-permissions igual que -p\n" -#~ " -s, --same-order ordena los nombres a extraer para " -#~ "coincidir con\n" -#~ " el archivo\n" -#~ " --preserve-order igual que -s\n" -#~ " --preserve igual que -p y -s a la vez\n" - -# ¿globbing = globales? sv -# Me parece una buena traducción, es algo que engloba a un grupo. fr -# -# globbing es, por ejemplo, lo que hace el shell cuando pones asteriscos: -# Cuando haces "cat *", el shell se encarga de expandir el * -# en lo que corresponda, y se lo da a cat ya traducido. -# Esto más que globalizar me suena a expandir, no sé. -# Si quieres déjalo que lo vea otro. sv -# Vid. mi comentario del mensaje anterior. gerardo -# quita -> elimina. sv -#~ msgid "" -#~ "\n" -#~ "Local file selection:\n" -#~ " -C, --directory=DIR change to directory DIR\n" -#~ " -T, --files-from=NAME get names to extract or create from file " -#~ "NAME\n" -#~ " --null -T reads null-terminated names, disable -" -#~ "C\n" -#~ " --exclude=PATTERN exclude files, given as a PATTERN\n" -#~ " -X, --exclude-from=FILE exclude patterns listed in FILE\n" -#~ " --anchored exclude patterns match file name start " -#~ "(default)\n" -#~ " --no-anchored exclude patterns match after any /\n" -#~ " --ignore-case exclusion ignores case\n" -#~ " --no-ignore-case exclusion is case sensitive (default)\n" -#~ " --wildcards exclude patterns use wildcards (default)\n" -#~ " --no-wildcards exclude patterns are plain strings\n" -#~ " --wildcards-match-slash exclude pattern wildcards match " -#~ "'/' (default)\n" -#~ " --no-wildcards-match-slash exclude pattern wildcards do not match " -#~ "'/'\n" -#~ " -P, --absolute-names don't strip leading `/'s from file names\n" -#~ " -h, --dereference dump instead the files symlinks point to\n" -#~ " --no-recursion avoid descending automatically in " -#~ "directories\n" -#~ " -l, --one-file-system stay in local file system when creating " -#~ "archive\n" -#~ " -K, --starting-file=NAME begin at file NAME in the archive\n" -#~ " --strip-path=NUM strip NUM leading components from file " -#~ "names\n" -#~ " before extraction\n" -#~ msgstr "" -#~ "\n" -#~ "Selección de fichero local:\n" -#~ " -C, --directory DIR cambia al directorio DIR\n" -#~ " -T, --files-from=NOMBRE obtiene los nombres a extraer o crear del\n" -#~ " archivo NOMBRE\n" -#~ " --null -T lee nombres terminados en cero, " -#~ "deshabilita -C\n" -#~ " --exclude=PATRÓN excluye ficheros, dados como un PATRÓN\n" -#~ " -X, --exclude-from=FICHERO excluye patrones listados en FICHERO\n" -#~ " --anchored los patrones de exclusión encajan desde el\n" -#~ " comienzo del nombre de fichero " -#~ "(predeterminado)\n" -#~ " --no-anchored los patrones de exclusión encajan después " -#~ "de\n" -#~ " cualquier /\n" -#~ " --ignore-case la exclusión considera iguales minúsculas " -#~ "y\n" -#~ " mayúsculas\n" -#~ " --no-ignore-case la exclusión distingue minúsculas de " -#~ "mayúsculas\n" -#~ " (predeterminado)\n" -#~ " --wildcards los patrones de exclusión incluyen " -#~ "comodines\n" -#~ " (predeterminado)\n" -#~ " --no-wildcards los patrones de exclusión son cadenas " -#~ "normales\n" -#~ " --wildcards-match-slash los comodines de los patrones de exclusión\n" -#~ " encajan con '/' (predeterminado)\n" -#~ " --wildcards-match-slash los comodines de los patrones de exclusión\n" -#~ " no encajan con '/'\n" -#~ " -P, --absolute-names no elimina las '/'s iniciales de los " -#~ "nombres de\n" -#~ " fichero\n" -#~ " -h, --dereference vuelca en su lugar los ficheros a los que " -#~ "apuntan\n" -#~ " los enlaces simbólicos.\n" -#~ " --no-recurse evita descender automáticamente en " -#~ "directorios\n" -#~ " -l, --one-file-system permanece en el sistema de ficheros local\n" -#~ " cuando se crea el archivo\n" -#~ " -K, --starting-file=NOMBRE comienza en el fichero NOMBRE del archivo\n" -#~ " --strip-path=NÚM elimina NÚM componentes iniciales de los " -#~ "nombres\n" -#~ " de los ficheros antes de la extracción\n" - -# # "más nuevos"->"más recientes". En el info de tar1.11.8 explica un poco más las -# # opciones --newer-*, sin limitar a "store", sino hablando en general de -# # cualquier operación. En el --newer-mtime debería ser --newer-mtime=DATE, y -# # dice que "limita la operación a los ficheros modificados después de la -# # fecha DATE"... ¿?. jmg -#~ msgid "" -#~ " -N, --newer=DATE-OR-FILE only store files newer than DATE-OR-FILE\n" -#~ " --newer-mtime=DATE compare date and time when data changed " -#~ "only\n" -#~ " --after-date=DATE same as -N\n" -#~ msgstr "" -#~ " -N, --newer=FECHA-O-FICHERO sólo almacena los ficheros más recientes " -#~ "que FECHA-O-FICHERO\n" -#~ " --newer-mtime=FECHA compara la fecha y hora en que los datos " -#~ "cambiaron\n" -#~ " --after-date=FECHA igual que -N\n" - -#~ msgid "" -#~ " --backup[=CONTROL] backup before removal, choose version " -#~ "control\n" -#~ " --suffix=SUFFIX backup before removal, override usual " -#~ "suffix\n" -#~ msgstr "" -#~ " --backup[=CONTROL] copia de seguridad antes de eliminar, " -#~ "elige\n" -#~ " el control de versión\n" -#~ " --suffix=SUFIJO copia de seguridad antes de eliminar, pasa " -#~ "por\n" -#~ " alto el sufijo habitual\n" - -# # print -> ¿muestra o imprime? Prefiero muestra, pero manténgase -# # siempre; ¡al menos en un mismo mensaje! gag -# Lo de "prolijamente" suena regular. En diffutils hay una laaarga discusión -# sobre ello. Yo usaría "verbosely"->"detalladamente" o "con detalle". jmg -# los bytes totales escritos -> el total de bytes escritos. nl -# O los bytes escritos en total, bien. gerardo -#~ msgid "" -#~ "\n" -#~ "Informative output:\n" -#~ " --help print this help, then exit\n" -#~ " --version print tar program version number, then exit\n" -#~ " -v, --verbose verbosely list files processed\n" -#~ " --checkpoint print directory names while reading the archive\n" -#~ " --check-links print a message if not all links are dumped\n" -#~ " --totals print total bytes written while creating archive\n" -#~ " --index-file=FILE send verbose output to FILE\n" -#~ " --utc print file modification dates in UTC\n" -#~ " -R, --block-number show block number within archive with each " -#~ "message\n" -#~ " -w, --interactive ask for confirmation for every action\n" -#~ " --confirmation same as -w\n" -#~ msgstr "" -#~ "\n" -#~ "Salida de información:\n" -#~ " --help muestra esta ayuda, y finaliza\n" -#~ " --version informa de la versión y finaliza\n" -#~ " -v, --verbose lista prolijamente los ficheros procesados\n" -#~ " --checkpoint muestra los nombres de directorio al leer el " -#~ "archivo\n" -#~ " --check-links muestra un mensaje si no se vuelcan todos los " -#~ "enlaces\n" -#~ " --totals muestra los bytes escritos en total al crear el " -#~ "archivo\n" -#~ " --index-file=FICHERO envía una salida detallada a FICHERO\n" -#~ " --utc muestra las fechas de modificación en UTC\n" -#~ " -R, --block-number muestra el número de bloque en el archivo con " -#~ "cada mensaje\n" -#~ " -w, --interactive pide confirmación para cada acción\n" -#~ " --confirmation igual que -w\n" - -# por defecto -> por omisión, de forma predeterminada -# HOST -> HUÉSPED, ANFITRIÓN (aquí estoy más perdido que el barco 'el -# arroz, ya lo sé; como con shell y script). gag -#~ msgid "" -#~ "\n" -#~ "ARCHIVE may be FILE, HOST:FILE or USER@HOST:FILE; DATE may be a textual " -#~ "date\n" -#~ "or a file name starting with `/' or `.', in which case the file's date is " -#~ "used.\n" -#~ "*This* `tar' defaults to `--format=%s -f%s -b%d'.\n" -#~ msgstr "" -#~ "\n" -#~ "GNU tar no puede leer ni generar archivos `--posix'. Si POSIXLY_CORRECT " -#~ "está\n" -#~ "definido en el entorno, las extensiones GNU se deshabilitan con `--" -#~ "posix'.\n" -#~ "El soporte para POSIX está sólo parcialmente implementado, no se debe " -#~ "contar \n" -#~ "con él aún.\n" -#~ "ARCHIVO puede ser FICHERO, HOST:FICHERO o USUARIO@HOST:FICHERO; FECHA " -#~ "puede ser\n" -#~ "una fecha textual, o un nombre de fichero que comience con `/' o con `.', " -#~ "en\n" -#~ "cuyo caso se utiliza la fecha del fichero.\n" -#~ "*Este* `tar' utiliza `--format=%s -f%s -b%d' por omisión.\n" - -#~ msgid "Written by John Gilmore and Jay Fenlason." -#~ msgstr "Escrito por John Gilmore y Jay Fenlason." - -# FIXME. Comunicar al autor. Con suerte quedará como un mensaje -# parecido que hay en fileutils: "fork system call failed". -# La solución de fileutils no me acaba de convencer (era "llamada -# a fork()" ). Yo pondría: "No se puede crear proceso hijo (fork)" -# que responde a la idea del fork y el paréntesis aclara. jmg -# Pero eso sería "Cannot create child process"... -# Yo creo que la solución de fileutils es la mejor. -# Tanto es así que lo pongo igual que allí. sv -# Literalmente es "No puedo bifurcar", pero como sabemos que -# `bifurcar' se refiere a la primitiva `fork()', está bien como está, -# salvo que se debería conservar la mayúscula inicial, y para mi gusto, -# simplificar, respetando el mensaje original: "Fallo en fork()" - gerardo -# Pongo la mayúscula inicial, pero antes de ser tan respetuoso con el original -# consultaré con el autor. sv -#~ msgid "Cannot dup" -#~ msgstr "Falló la llamada al sistema `dup'" - -#~ msgid "Cannot use compressed or remote archives" -#~ msgstr "No se pueden usar archivos comprimidos ni remotos" - -# ¿Por qué en todo lugar donde dice "child" se traduce como "proceso hijo" y -# no como "hijo" directamente? nl -# Para que esté más claro. ¿es demasiado libre la traducción? sv -# ¿Gerardo? -# Hola. Hay dos posturas a la hora de traducir: -# a) respetar escrupulosamente el mensaje original y traducir -# literalmente, o casi. -# b) buscar la mejor interpretación de forma que un hispanohablante lo -# entienda lo mejor posible, aunque se "corrija" al autor; siempre -# sin cambiar el sentido o la idea del mensaje, claro. -# Yo prefiero (b) generalmente. Está claro que aquí child se refiere a un -# proceso, un proceso derivado de otro, proceso hijo. Daría igual dejar hijo -# solamente, pero así está mejor expresado. Me gusta más. -#~ msgid "tar (child)" -#~ msgstr "tar (proceso hijo)" - -#~ msgid "tar (grandchild)" -#~ msgstr "tar (proceso nieto)" - -#~ msgid "Child returned status %d" -#~ msgstr "El proceso hijo devolvió el estado %d" - -#~ msgid "Member names contain `..'" -#~ msgstr "Los nombres contienen `..'" - -#~ msgid "%s: Member name contains `..'" -#~ msgstr "%s: El nombre contiene `..'" - -# Nota aclaratoria: (Gerardo) -# Incluida no lleva tilde. -# Ni ruido ni huida ni güiro (un instrumento musical cubano). -# Sí se parte en in-clu-i-da, pero sin tilde. No existe el hiato. -# Mira en un diccionario `ruido' a ver si tiene tilde, y considera si -# no es el mismo caso (Rui-do no: ru-i-do). -# -# Más arriba has usado "implies"->"implica", así que aquí -# sería "implied by"->"implicada por", o modificar lo otro. jmg -# Pero es que implica suena bien pero implicada por suena fatal. sv -#~ msgid "Obsolete option, now implied by --blocking-factor" -#~ msgstr "Opción obsoleta, ahora incluida en --blocking-factor" - -# Pregunta: ¿qué es reemplazado/a el nombre o la opción? sv -# Creo que es el nombre. fr -# # El nombre de la opción; lo que pasa es que en el mensaje en español -# # no se entiende muy bien. Quizá: nombre obsoleto de la opción -# # remplazado por -- ... gag -#~ msgid "Obsolete option name replaced by --blocking-factor" -#~ msgstr "Nombre de opción obsoleta reemplazado por --blocking-factor" - -# # Ver msj. anterior -#~ msgid "Obsolete option name replaced by --read-full-records" -#~ msgstr "Nombre de opción obsoleta reemplazado por --read-full-records" - -#~ msgid "Obsolete option name replaced by --touch" -#~ msgstr "Nombre de opción obsoleta reemplazado por --touch" - -#~ msgid "Conflicting archive format options" -#~ msgstr "Opciones de formato de archivo en conflicto" - -#~ msgid "Obsolete option name replaced by --absolute-names" -#~ msgstr "Nombre de opción obsoleta reemplazado por --absolute-names" - -#~ msgid "Obsolete option name replaced by --block-number" -#~ msgstr "Nombre de opción obsoleta reemplazado por --block-number" - -#~ msgid "Obsolete option name replaced by --backup" -#~ msgstr "Nombre de opción obsoleta reemplazado por --backup" - -#~ msgid "" -#~ "If a long option shows an argument as mandatory, then it is mandatory\n" -#~ "for the equivalent short option also.\n" -#~ "\n" -#~ " -l, --file-length=LENGTH LENGTH of generated file\n" -#~ " -p, --pattern=PATTERN PATTERN is `default' or `zeros'\n" -#~ " --help display this help and exit\n" -#~ " --version output version information and exit\n" -#~ msgstr "" -#~ "Los argumentos obligatorios para las opciones largas son también " -#~ "obligatorios\n" -#~ "para las opciones cortas.\n" -#~ "\n" -#~ " -l, --file-length=LONGITUD LONGITUD del fichero generado\n" -#~ " -p, --pattern=PATRÓN PATRÓN es `default' o `zeros'\n" -#~ " --help muestra esta ayuda y sale\n" -#~ " --version informa de la versión y finaliza\n" - -#~ msgid "Ambiguous pattern `%s'" -#~ msgstr "El patrón `%s' es ambiguo" - -# Me encantaría poder incluir tos propuestas de usar el \372 ( aspa ) y -# el (C) , veremos si lo hacemos algún día. em+ -# Estaría bien cambiar el '(C)' por '©', que es otro carácter de -# ISO-Latin1. Como los yanquis usan el ASCII (US ISO-646), que es de -# 7 bits, no lo pueden usar; nosotros sí. gerardo -# Pues eso: que si os encanta, ¿por qué no lo hacéis? ¿Cuál es el problema? -# Bueno, vale, de acuerdo... sv -#~ msgid "Copyright %d Free Software Foundation, Inc." -#~ msgstr "© %d Free Software Foundation, Inc." - -#~ msgid "" -#~ "This is free software; see the source for copying conditions. There is " -#~ "NO\n" -#~ "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR " -#~ "PURPOSE.\n" -#~ msgstr "" -#~ "Esto es software libre; vea el código fuente para las condiciones de " -#~ "copia.\n" -#~ "No hay NINGUNA garantía; ni siquiera de COMERCIABILIDAD o IDONEIDAD PARA " -#~ "UN\n" -#~ "FIN DETERMINADO.\n" - -#~ msgid "Write to compression program short %lu bytes" -#~ msgstr "La escritura al programa de compresión acorta %lu bytes" - -#~ msgid "Removing `%.*s' prefix from member names" -#~ msgstr "Eliminando el prefijo `%.*s' de los nombres" - -#~ msgid "Invalid group given on option" -#~ msgstr "Se ha especificado un grupo no válido en la opción" - -#~ msgid "Invalid owner given on option" -#~ msgstr "Se ha especificado un propietario no válido en la opción" - -#~ msgid "Cannot close file descriptor" -#~ msgstr "No se puede cerrar el descriptor de fichero" - -#~ msgid "Cannot properly duplicate %s" -#~ msgstr "No se puede duplicar %s correctamente" - -#~ msgid "(child) Pipe to stdin" -#~ msgstr "(proceso hijo) Se abre una tubería desde la entrada estándar" - -#~ msgid "Archive to stdout" -#~ msgstr "Archivo hacia la salida estándar" - -#~ msgid "((child)) Pipe to stdout" -#~ msgstr "((proceso hijo)) Se abre una tubería hacia la salida estándar" - -#~ msgid "(grandchild) Pipe to stdin" -#~ msgstr "(proceso nieto) Se abre una tubería desde la entrada estándar" - -#~ msgid "(child) Pipe to stdout" -#~ msgstr "(proceso hijo) Se vuelca el resultado por la salida estándar" - -#~ msgid "((child)) Pipe to stdin" -#~ msgstr "((proceso hijo)) Se abre una tubería desde la entrada estándar" - -#~ msgid "(grandchild) Pipe to stdout" -#~ msgstr "(proceso nieto) Se abre una tubería hacia la salida estándar" - -#~ msgid "Only wrote %lu of %lu bytes to %s" -#~ msgstr "Sólo se escribieron %lu de %lu bytes en %s" - -# FIXME: No queda claro si es al cerrar, cerrando, cierre, o qué. sv -#~ msgid "WARNING: %s: close (%d, %d)" -#~ msgstr "ATENCIÓN: %s: se cierra (%d, %d)" - -#~ msgid "Cannot allocate memory for diff buffer of %lu bytes" -#~ msgstr "" -#~ "No se puede asignar memoria para el búfer de diferencias de %lu bytes" - -#~ msgid "Wrote %s of %s bytes to file %s" -#~ msgstr "Se escribieron %s de %s bytes en el fichero %s" - -#~ msgid "lseek error at byte %s in file %s" -#~ msgstr "Error de lectura en el byte %s en el fichero %s" - -# "se rellena" debería ser "rellenando". "se rellena" puede entenderse como -# varias cosas, no queda claro que es lo que se esta haciendo, podría indicar -# lo que se suele hacer.. =) "rellenando con ceros" es perfecto y es -# exactamente lo que está escrito en el original. sv -# -# Que sí, reconozco que la traducción es un poco libre. -# Pero mi intención es que el programa diga lo que va haciendo, no lo que ya -# ha hecho. Ni siquiera el original es consistente en los modos verbales. sv -#~ msgid "File %s shrunk, padding with zeros" -#~ msgstr "El tamaño del fichero %s ha disminuido, se rellena con ceros" - -# OK em+ -# Can't = no se puede; couldn't: no se ha podido. gag -# O no se pudo. sv -# Esa forma verbal se debería usar para cosas ocurridas hace mucho más tiempo. -# No pude hacer la Primera Comunión vestido de hombre-rana, no he podido -# escribir esta frase en caracteres jeroglíficos. gag -# -#~ msgid "Cannot reposition archive file" -#~ msgstr "No se puede reposicionar el archivo" - -#~ msgid "%s: Cannot lchown to uid %lu gid %lu" -#~ msgstr "" -#~ "%s: No se puede cambiar el propietario y grupo con `lchown' a uid %lu gid " -#~ "%lu" - -#~ msgid "%s: Cannot chown to uid %lu gid %lu" -#~ msgstr "" -#~ "%s: No se puede cambiar el propietario y grupo con `chown' a uid %lu gid " -#~ "%lu" - -#~ msgid "%s: lseek error at byte %s" -#~ msgstr "%s: error de desplazamiento en el byte %s" - -#~ msgid "%s: Could only write %s of %s bytes" -#~ msgstr "%s: Sólo se pudieron escribir %s de %s bytes" - -#~ msgid "Error while deleting %s" -#~ msgstr "Error al borrar %s" - -#~ msgid "Only wrote %lu of %lu bytes to file %s" -#~ msgstr "Sólo se escribieron %lu de %lu bytes al archivo %s" - -#~ msgid "Renaming previous %s to %s\n" -#~ msgstr "Se renombra el anterior %s como %s\n" - -#~ msgid "%s: Cannot rename for backup" -#~ msgstr "%s: No se puede renombrar para hacer una copia de seguridad" - -#~ msgid "%s: Cannot rename from backup" -#~ msgstr "%s: No se puede renombrar de la copia de seguridad" - -# FIXME. No es traducible. -#~ msgid "Cannot %s %s" -#~ msgstr "No se puede %s %s" - -#~ msgid "Read error at byte %s reading %lu bytes in file %s" -#~ msgstr "Error de lectura en el byte %s leyendo %lu bytes en el fichero %s" - -#~ msgid "Cannot open pipe" -#~ msgstr "No se puede abrir la tubería" - -#~ msgid "Cannot open archive %s" -#~ msgstr "No se puede abrir el archivo %s" - -#~ msgid "Cannot exec %s" -#~ msgstr "No se puede ejecutar %s" - -# lo mismo de antes. sv -#~ msgid "Child cannot fork" -#~ msgstr "El proceso hijo no puede bifurcarse" +msgstr "--stat necesita nombres de ficheros" -#~ msgid "Cannot read from compression program" -#~ msgstr "No se puede leer del programa de compresión" +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "no se puede usar --occurrence con %s" -#~ msgid "Cannot write to %s" -#~ msgstr "No se puede escribir en %s" +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "No se puede combinar --listed-incremental con --newer" -#~ msgid "WARNING: Cannot truncate %s" -#~ msgstr "ATENCIÓN: No se puede truncar %s" +#~ msgid "--verify cannot be used with %s" +#~ msgstr "--verify no se puede usar con %s" -#~ msgid "While waiting for child" -#~ msgstr "Mientras se esperaba al hijo" - -# Estos errores son para el debug del programa. A quien le pueda -# interesar sabe lo que quiere decir em+ -# ¡Otras veces se ha puesto bifurcar sin el (fork)! Esto es difícil, -# porque también podría ponerse: "No se puede hacer fork()", ya que -# fork() es un punto de entrada a una primitiva Unix; vaya, una -# función. gag -# FIXME. Hablar con el autor. -# en fileutils-3.16.es.po, el autor cambió el "Cannot fork" por "fork -# system call failed", con lo que podría pasar lo mismo ahora. Si no -# hay cambios, yo preferiría: "¡No se puede crear proceso hijo (fork)!" -# jmg -#~ msgid "Cannot fork!" -#~ msgstr "¡No se puede bifurcar!" - -#~ msgid "Cannot exec a shell %s" -#~ msgstr "No se puede ejecutar un shell %s" - -#~ msgid "Cannot read %s" -#~ msgstr "No se puede leer %s" - -#~ msgid "Error while closing %s" -#~ msgstr "Error al cerrar %s" - -#~ msgid "Cannot read link %s" -#~ msgstr "No se puede leer el enlace %s" - -#~ msgid "Could not rewind archive file for verify" -#~ msgstr "No se pudo rebobinar el archivo para verificar" - -#~ msgid "Cannot add file %s" -#~ msgstr "No se puede añadir el fichero %s" - -#~ msgid "Cannot add directory %s" -#~ msgstr "No se puede añadir el directorio %s" - -#~ msgid "Cannot open directory %s" -#~ msgstr "No se puede abrir el directorio %s" - -#~ msgid "%s: Could not write to file" -#~ msgstr "%s: No se pudo escribir en el fichero" - -#~ msgid "%s: Could not create file" -#~ msgstr "%s: No se pudo crear el fichero" - -#~ msgid "%s: Error while closing" -#~ msgstr "%s: Error al cerrar" - -#~ msgid "%s: Could not make node" -#~ msgstr "%s: No se pudo crear el nodo" - -# Pongo comitas porque no es una palabra española. -# A quien no le guste que abra el debate sobre cuándo sí y cuándo no -# deben ponerse comitas en es@li.org. -#~ msgid "%s: Could not make fifo" -#~ msgstr "%s: No se pudo crear el `fifo'" - -#~ msgid "%s: Could not create directory" -#~ msgstr "%s: No se pudo crear el directorio" - -#~ msgid "Added write and execute permission to directory %s" -#~ msgstr "Añadidos permisos de escritura y ejecución al directorio %s" - -#~ msgid "Cannot open file %s" -#~ msgstr "No se puede abrir el fichero %s" - -#~ msgid "" -#~ "\n" -#~ "Usage: %s [OPTION]... [FILE]...\n" -#~ msgstr "" -#~ "\n" -#~ "Modo de empleo: %s [OPCIÓN]... [FICHERO]...\n" - -# Me encantaría poder incluir tos propuestas de usar el \372 ( aspa ) y -# el (C) , veremos si lo hacemos algún día. em+ -# Estaría bien cambiar el '(C)' por '©', que es otro carácter de -# ISO-Latin1. Como los yanquis usan el ASCII (US ISO-646), que es de -# 7 bits, no lo pueden usar; nosotros sí. Incluso "Copyright" por -# "Derechos de copia". Ya lo de FSF por Fundación del Logical Libre -# es demasiado, ¿verdad? :-) gag -# < ¿Puede alguien explicarme por qué no se hace ya, o no se ha hecho -# antes? ¿Qué diferencia hay, bajo el punto de vista de ser caracteres -# válidos, entre 'ó' y 'ß' o entre 'ñ' y '¤' o entre 'º' y '©' o entre -# '¿' y '¼'? Lo único que se me ocurre es que es algo difícil introducir -# esos caracteres porque no están en el teclado del PC. No hay más que -# irse a una terminal o teclado con tecla de Componer o usar el Emacs con -# C-q ooo (ooo = número octal) con la tabla (man iso_8859_1) al lado. -# ¿Alguien tiene otra explicación? -# -# Se ven peor. Estas cosas deben ser bien legibles desde consola, y el -# Copyright ese © no se ve demasiado bien. sv -# Nostoy dacuerdo. Protesto enérgicamente. gerardo -# No tendría ningún inconveniente en usar ese carácter si el objetivo final -# fuera que apareciese por una láser de 300ppp, pero el objetivo es que se -# vea por consola, y con la poca resolución que tiene no es un Copyright -# hecho y derecho sino una C dentro de algo que parece más bien un cuadrado -# con los bordes redondeados. Incluso el (C) Sinclair Research... -# se veía mejor que el de los PCs. sv -# Bueno, eso es un problema del tipo de letra, no del traductor. Además (C) -# es el sucedáneo legal del ©, como TeX cuando no se puede poner como \TeX{}. -# Pero es un sucedáneo, no el original. Es un copyright light. A más a más, -# como dicen los catalanes, que ya aparece delante la palabra Copyright, por -# lo que no debe haber ambigüedad. gerardo -# -# Hombre, el objetivo del traductor es que se entienda, y por ser (C) -# el "sucedáneo legal", como tú le dices, es razonable usarlo. -# En cambio la "ñ" no tiene sucedáneo legal, por lo que poner -# "espagna" o "espa~na" sería completamente inaceptable. -# Y si lo miras bien, todos son sucedáneos, pues las letras no "son" -# pixelizadas. Lo que yo digo es que © no es un sucedáneo más bonito que (C) -# para el símbolo de copyright. sv -#~ msgid "" -#~ "\n" -#~ "Copyright 1988, 92,93,94,95,96,97,98, 1999 Free Software Foundation, " -#~ "Inc.\n" -#~ msgstr "" -#~ "\n" -#~ "Copyright 1988, 92,93,94,95,96,97,98, 1999 Free Software Foundation, " -#~ "Inc.\n" - -# ¿por qué convertir las oraciones unimembres en bimembres? Ya vi -# otro caso en donde se hace y no veo por qué. Bien podría quedar como: -# "Nombre de fichero %s%s demasiado largo". nl -# Algunas de esas frases suenan a "indio" sv -# Hombre, esto no es una novela (del Oeste :-), la forma "india" es -# más literal y más corta, lo que quizá sea más apropiado para mensajes -# concisos como éstos; pero en realidad es más agradable de leer así. -# El traductor manda. gerardo -#~ msgid "File name %s%s too long" -#~ msgstr "El nombre de fichero %s%s es demasiado largo" - -#~ msgid "Skipping to next file header" -#~ msgstr "Saltando a la siguiente cabecera de fichero" - -#~ msgid "Could not get current directory: %s" -#~ msgstr "No se pudo obtener el directorio actual: %s" - -#~ msgid "File name %s/%s too long" -#~ msgstr "El nombre del fichero %s/%s es demasiado largo" - -#~ msgid "%s: out-of-range timestamp `%s' ignored" -#~ msgstr "%s: no se tendrá en cuenta la marca de fecha `%s' fuera de rango" - -#~ msgid "Cannot chdir to %s" -#~ msgstr "No se puede cambiar al directorio %s" - -#~ msgid "Arithmetic overflow" -#~ msgstr "Sobrepasamiento aritmético" - -#~ msgid "Data differs" -#~ msgstr "Los datos son distintos" - -#~ msgid "File does not exist" -#~ msgstr "El fichero no existe" - -#~ msgid "Not a regular file" -#~ msgstr "No es un fichero regular" - -#~ msgid "Does not exist" -#~ msgstr "No existe" - -#~ msgid "No such file or directory" -#~ msgstr "No existe el fichero o el directorio" - -#~ msgid "Mode or device-type changed" -#~ msgstr "El modo o el tipo de dispositivo ha cambiado" - -#~ msgid "No longer a directory" -#~ msgstr "Ya no es un directorio" - -# Lo mismo. sv -# Sugerencia: Sendero -> Ruta, camino. sv -# Lo siento, no me salía la palabra. Esperaba correción. fr -# Siempre he estado usando ruta en otras traducciones em+ -# # Esta vez sugiero "camino", por seguir la terminología de -# # Microsoft, ya que da lo mismo, ¿no? gag -# Quedaría igualmente claro si no se hace referencia a ruta: -# "... de los nombres absolutos en el archivo". jmg -#~ msgid "Removing leading `/' from absolute path names in the archive" -#~ msgstr "" -#~ "Borrando la `/' inicial de los nombres absolutos de ruta en el archivo" - -#~ msgid "Amount actually written is (I hope) %d.\n" -#~ msgstr "La cantidad realmente escrita (esperemos) es %d.\n" +#~ msgid "--preserve-order is not compatible with --listed-incremental" +#~ msgstr "--preserve-order no es compatible con --listed-incremental" diff --git a/po/et.gmo b/po/et.gmo index 243195f..ea90cb3 100644 Binary files a/po/et.gmo and b/po/et.gmo differ diff --git a/po/et.po b/po/et.po index 0c59b8e..a8c9970 100644 --- a/po/et.po +++ b/po/et.po @@ -1,20 +1,20 @@ # This file is distributed under the same license as the tar package. # Estonian translations for GNU tar. # Copyright (C) 2001 Free Software Foundation, Inc. -# Toomas Soome , 2011. +# Toomas Soome , 2013. # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" -"Project-Id-Version: GNU tar 1.26\n" +"Project-Id-Version: GNU tar 1.27\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" -"PO-Revision-Date: 2011-03-12 18:29+0200\n" -"Last-Translator: Toomas Soome \n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" +"PO-Revision-Date: 2013-10-07 02:17+0300\n" +"Last-Translator: Toomas Soome \n" "Language-Team: Estonian \n" "Language: et\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-15\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -35,12 +35,12 @@ msgstr "Lubatud argumendid on:" #: gnu/argp-help.c:150 #, c-format msgid "ARGP_HELP_FMT: %s value is less than or equal to %s" -msgstr "ARGP_HELP_FMT: %s väärtus on väiksem või võrdne kui %s" +msgstr "ARGP_HELP_FMT: %s väärtus on väiksem või võrdne kui %s" #: gnu/argp-help.c:223 #, c-format msgid "%.*s: ARGP_HELP_FMT parameter requires a value" -msgstr "%.*s: ARGP_HELP_FMT parameeter nõuab väärtust" +msgstr "%.*s: ARGP_HELP_FMT parameeter nõuab väärtust" #: gnu/argp-help.c:229 #, c-format @@ -55,15 +55,15 @@ msgstr "%.*s: Tundmatu ARGP_HELP_FMT parameeter" #: gnu/argp-help.c:250 #, c-format msgid "Garbage in ARGP_HELP_FMT: %s" -msgstr "Prügi ARGP_HELP_FMT parameetrites: %s" +msgstr "Prügi ARGP_HELP_FMT parameetrites: %s" #: gnu/argp-help.c:1250 msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." msgstr "" -"Kohustuslikud või mittekohustuslikud argumendid pikkadele võtmetele on ka " -"kohustuslikud või mittekohustuslikud vastavatele lühikestele võtmetele." +"Kohustuslikud või mittekohustuslikud argumendid pikkadele võtmetele on ka " +"kohustuslikud või mittekohustuslikud vastavatele lühikestele võtmetele." #: gnu/argp-help.c:1643 msgid "Usage:" @@ -71,16 +71,16 @@ msgstr "Kasutamine:" #: gnu/argp-help.c:1647 msgid " or: " -msgstr " või: " +msgstr " või: " #: gnu/argp-help.c:1659 msgid " [OPTION...]" -msgstr " [VÕTI...]" +msgstr " [VÕTI...]" #: gnu/argp-help.c:1686 -#, fuzzy, c-format +#, c-format msgid "Try '%s --help' or '%s --usage' for more information.\n" -msgstr "`%s --help' või `%s --usage' annab rohkem infot.\n" +msgstr "Lisainfo saamiseks kasutage '%s --help' või '%s --usage'.\n" #: gnu/argp-help.c:1714 #, c-format @@ -89,17 +89,17 @@ msgstr "Teated vigadest saatke palun aadressil %s.\n" #: gnu/argp-help.c:1933 gnu/error.c:190 msgid "Unknown system error" -msgstr "Tundmatu süsteemi viga" +msgstr "Tundmatu süsteemi viga" #: gnu/argp-parse.c:83 msgid "give this help list" -msgstr "näita seda abiinfot" +msgstr "näita seda abiinfot" #: gnu/argp-parse.c:84 msgid "give a short usage message" -msgstr "näita lühikest kasutamise õpetust" +msgstr "näita lühikest kasutamise õpetust" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "NIMI" @@ -131,80 +131,80 @@ msgstr "%s: Liiga palju argumente\n" #: gnu/argp-parse.c:757 msgid "(PROGRAM ERROR) Option should have been recognized!?" -msgstr "(PROGRAMMI VIGA) Võti peaks olema ära tuntud!?" +msgstr "(PROGRAMMI VIGA) Võti peaks olema ära tuntud!?" #: gnu/closeout.c:114 msgid "write error" msgstr "viga kirjutamisel" #: gnu/getopt.c:549 gnu/getopt.c:578 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: võti '%s' on segane\n" +msgstr "%s: võti '%s' on segane; valikud:" #: gnu/getopt.c:626 gnu/getopt.c:630 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: võtmel '--%s' pole argumente\n" +msgstr "%s: võtmel '--%s' pole argumente\n" #: gnu/getopt.c:639 gnu/getopt.c:644 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: võtmel '%c%s' pole argumente\n" +msgstr "%s: võtmel '%c%s' pole argumente\n" #: gnu/getopt.c:687 gnu/getopt.c:706 #, c-format msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: võti '--%s' nõuab argumenti\n" +msgstr "%s: võti '--%s' nõuab argumenti\n" #: gnu/getopt.c:744 gnu/getopt.c:747 #, c-format msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: tundmatu võti '--%s'\n" +msgstr "%s: tundmatu võti '--%s'\n" #: gnu/getopt.c:755 gnu/getopt.c:758 #, c-format msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: tundmatu võti '%c%s'\n" +msgstr "%s: tundmatu võti '%c%s'\n" #: gnu/getopt.c:807 gnu/getopt.c:810 #, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "%s: vigane võti -- '%c'\n" +msgstr "%s: vigane võti -- '%c'\n" #: gnu/getopt.c:863 gnu/getopt.c:880 gnu/getopt.c:1090 gnu/getopt.c:1108 #, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s: võti nõuab argumenti -- '%c'\n" +msgstr "%s: võti nõuab argumenti -- '%c'\n" #: gnu/getopt.c:936 gnu/getopt.c:952 #, c-format msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: võti '-W %s' on segane\n" +msgstr "%s: võti '-W %s' on segane\n" #: gnu/getopt.c:976 gnu/getopt.c:994 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: võti '-W %s' ei luba argumenti\n" +msgstr "%s: võti '-W %s' ei luba argumenti\n" #: gnu/getopt.c:1015 gnu/getopt.c:1033 #, c-format msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: võti '-W %s' nõuab argumenti\n" +msgstr "%s: võti '-W %s' nõuab argumenti\n" #: gnu/obstack.c:415 gnu/obstack.c:417 gnu/xalloc-die.c:36 msgid "memory exhausted" -msgstr "mälu on otsas" +msgstr "mälu on otsas" #: gnu/openat-die.c:40 #, c-format msgid "unable to record current working directory" -msgstr "ei õnnestu salvestada jooksvat töökataloogi" +msgstr "ei õnnestu salvestada jooksvat töökataloogi" #: gnu/openat-die.c:59 #, c-format msgid "failed to return to initial working directory" -msgstr "algsesse töökataloogi ei õnnestu tagasi minna" +msgstr "algsesse töökataloogi ei õnnestu tagasi minna" #. TRANSLATORS: #. Get translations for open and closing quotation marks. @@ -270,7 +270,7 @@ msgstr "Paketi looja %s\n" #. locale. Otherwise, do not translate "(C)"; leave it as-is. #: gnu/version-etc.c:86 msgid "(C)" -msgstr "©" +msgstr "©" #: gnu/version-etc.c:88 msgid "" @@ -282,7 +282,7 @@ msgid "" "\n" msgstr "" "\n" -"Litsents GPLv3+: GNU GPL versioon 3 või uuem .\n" "See on vaba tarkvara: teil on lubatud seda muuta ja levitada.\n" "GARANTII PUUDUB, vastaval seadusega lubatud piiridele.\n" @@ -427,71 +427,71 @@ msgstr "%s koduleht: \n" #: gnu/version-etc.c:258 msgid "General help using GNU software: \n" msgstr "" -"Üldine abiinfo GNU tarkvara kasutamisest: \n" +"Ãœldine abiinfo GNU tarkvara kasutamisest: \n" #. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'. #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" -msgstr "%s: %s ei õnnestu" +msgstr "%s: %s ei õnnestu" #. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'. #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" -msgstr "%s: Hoiatus: %s ei õnnestu" +msgstr "%s: Hoiatus: %s ei õnnestu" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" -msgstr "%s: Ei õnnestu seada uueks moodiks %s" +msgstr "%s: Ei õnnestu seada uueks moodiks %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" -msgstr "%s: Ei õnnestu seada omanikuks uid %lu, gid %lu" +msgstr "%s: Ei õnnestu seada omanikuks uid %lu, gid %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: Viidet %s ei saa luua" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Lugemisviga baidil %s, loen %lu baiti" msgstr[1] "%s: Lugemisviga baidil %s, loen %lu baiti" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Hoiatus: Lugemisviga baidil %s, loen %lu baiti" msgstr[1] "%s: Hoiatus: Lugemisviga baidil %s, loen %lu baiti" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" -msgstr "%s: Ei õnnestu liikuda positsioonile %s" +msgstr "%s: Ei õnnestu liikuda positsioonile %s" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: Hoiatus: Ei saa positsioneerida %s" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: Ei saa luua %s nimeviidet" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -510,11 +510,11 @@ msgstr "Eemaldan viidatavate nimedelt prefiksi `%s'" #: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" -msgstr "Kasutan tühjade nimede asemel `.'" +msgstr "Kasutan tühjade nimede asemel `.'" #: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" -msgstr "Kasutan tühja viidatava nime asemel `.'" +msgstr "Kasutan tühja viidatava nime asemel `.'" #: lib/rtapelib.c:299 #, c-format @@ -529,26 +529,26 @@ msgstr "standard sisend" #: lib/rtapelib.c:306 #, c-format msgid "stdout" -msgstr "standard väljund" +msgstr "standard väljund" #: lib/rtapelib.c:429 #, c-format msgid "Cannot connect to %s: resolve failed" -msgstr "Ei õnnestu luua ühendust masinaga %s: nimelahendus ebaõnnestus" +msgstr "Ei õnnestu luua ühendust masinaga %s: nimelahendus ebaõnnestus" #: lib/rtapelib.c:502 -#, fuzzy, c-format +#, c-format msgid "Cannot redirect files for remote shell" -msgstr "Ei saa käivitada kaug käsuinterpretaatorit" +msgstr "Teise serveri käsuinterpretaatorile ei saa faile ümber suunata" #: lib/rtapelib.c:516 #, c-format msgid "Cannot execute remote shell" -msgstr "Ei saa käivitada kaug käsuinterpretaatorit" +msgstr "Ei saa käivitada kaug käsuinterpretaatorit" #: rmt/rmt.c:432 msgid "Seek direction out of range" -msgstr "Otsimise suund on piiridest väljas" +msgstr "Otsimise suund on piiridest väljas" #: rmt/rmt.c:438 msgid "Invalid seek direction" @@ -560,7 +560,7 @@ msgstr "Vigane seek indeks" #: rmt/rmt.c:452 msgid "Seek offset out of range" -msgstr "Otsimise indeks on piiridest väljas" +msgstr "Otsimise indeks on piiridest väljas" #: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608 msgid "Invalid byte count" @@ -568,11 +568,11 @@ msgstr "Vigane baitide arv" #: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625 msgid "Byte count out of range" -msgstr "Baitide arv on piiridest väljas" +msgstr "Baitide arv on piiridest väljas" #: rmt/rmt.c:558 msgid "Premature eof" -msgstr "Ootamatu faili lõpp" +msgstr "Ootamatu faili lõpp" #: rmt/rmt.c:601 msgid "Invalid operation code" @@ -588,21 +588,21 @@ msgstr "Ootamatud argumendid" #: rmt/rmt.c:689 msgid "Manipulate a tape drive, accepting commands from a remote process" -msgstr "Opereeri lindiseadet, aktsepteerib käske mittelokaalselt protsessilt" +msgstr "Opereeri lindiseadet, aktsepteerib käske mittelokaalselt protsessilt" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "N" #: rmt/rmt.c:697 msgid "set debug level" -msgstr "määra silumise tase" +msgstr "määra silumise tase" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "FAIL" @@ -622,184 +622,192 @@ msgstr "liiga palju argumente" #: rmt/rmt.c:822 msgid "Garbage command" -msgstr "Rämpskäsk" +msgstr "Rämpskäsk" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Hmm.... see ei tundu olema tar arhiiv" -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" -msgstr "Baite kirjutatud kokku" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" msgstr "Baite loetud kokku" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "Baite kirjutatud kokku" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Baite kirjutatud kokku: %s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(toru)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" -msgstr "Kirje suuruse väärtus on vigane" +msgstr "Kirje suuruse väärtus on vigane" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Arhiivi nime pole" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" -msgstr "Ei saa kontrollida sisend/väljund arhiive" +msgstr "Ei saa kontrollida sisend/väljund arhiive" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" -msgstr "Arhiiv on tihendatud. Kasutage võtit %s" +msgstr "Arhiiv on tihendatud. Kasutage võtit %s" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Ei saa uuendada pakitud arhiive" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" -msgstr "Lindi alguses, lõpetan töö" +msgstr "Lindi alguses, lõpetan töö" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" -msgstr "Liig palju vigu, jätan töö pooleli" +msgstr "Liig palju vigu, jätan töö pooleli" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Kirje suurus = %lu blokki" msgstr[1] "Kirje suurus = %lu blokki" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "Joondamata blokk (%lu baiti) arhiivis" msgstr[1] "Joondamata blokk (%lu baiti) arhiivis" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" -"Arhiivi ei õnnestu tagasi kerida; lugemiseks võib olla vajalik kasutada " -"võtit -i" +"Arhiivi ei õnnestu tagasi kerida; lugemiseks võib olla vajalik kasutada " +"võtit -i" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek ei peatunud kirje piiril" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" -msgstr "%s: sisaldab vigast volüümi numbrit" +msgstr "%s: sisaldab vigast volüümi numbrit" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" -msgstr "Volüümi number on liiga suur" +msgstr "Volüümi number on liiga suur" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " -msgstr "Otsi volüüm #%d %s'le ja vajuta return klahvi: " +msgstr "Otsi volüüm #%d %s'le ja vajuta return klahvi: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "EOF kasutaja vastuse asemel" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" -msgstr "HOIATUS: Arhiiv pole täielik" +msgstr "HOIATUS: Arhiiv pole täielik" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" " q Abort tar\n" " y or newline Continue operation\n" msgstr "" -" n nimi Anna järgmistele volüümidele uus nimi\n" +" n nimi Anna järgmistele volüümidele uus nimi\n" " q Katkesta tar\n" -" y või reavahetus Jätka\n" +" y või reavahetus Jätka\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Loo alamshell\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" -msgstr " ? Väljasta see info\n" +msgstr " ? Väljasta see info\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" -msgstr "Pole uus volüüm; lõpetan töö.\n" +msgstr "Pole uus volüüm; lõpetan töö.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "Puudub faili nimi. Proovige uuesti.\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Vigane sisend. ? annab abiinfot.\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" -msgstr "%s käsklus sai vea" +msgstr "%s käsklus sai vea" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" -msgstr "võimalik et %s jätkub sellel volüümil: päises on lühendatud nimi" +msgstr "võimalik et %s jätkub sellel volüümil: päises on lühendatud nimi" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" -msgstr "%s ei jätku sellel volüümil" +msgstr "%s ei jätku sellel volüümil" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s on vale suurusega (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, c-format msgid "This volume is out of sequence (%s - %s != %s)" -msgstr "See volüüm on väljaspoolt järjekorda (%s - %s != %s)" +msgstr "See volüüm on väljaspoolt järjekorda (%s - %s != %s)" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" -msgstr "Arhiivi märgend ei sobi %s" +msgstr "Arhiivi märgend ei sobi %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" -msgstr "Volüüm %s ei sobi volüümiga %s" +msgstr "Volüüm %s ei sobi volüümiga %s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" -"%s: faili nimi on GNU mitmevolüümi päisesse salvestamiseks liiga pikk, " -"lühendan" +"%s: faili nimi on GNU mitmevolüümi päisesse salvestamiseks liiga pikk, " +"lühendan" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "kirjutamine ei peatunud bloki piiril" @@ -810,18 +818,18 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Sain lugeda ainult %lu baiti (sooviti %lu)" msgstr[1] "Sain lugeda ainult %lu baiti (sooviti %lu)" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "Sisu on erinev" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" -msgstr "Ootamatu arhiivi lõpp" +msgstr "Ootamatu arhiivi lõpp" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" -msgstr "Failitüübid on erinevad" +msgstr "Failitüübid on erinevad" #: src/compare.c:183 src/compare.c:203 src/compare.c:324 msgid "Mode differs" @@ -839,7 +847,7 @@ msgstr "GID on erinevad" msgid "Mod time differs" msgstr "Muutmise ajad erinevad" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Suurused erinevad" @@ -856,58 +864,58 @@ msgstr "Nimeviited erinevad" msgid "Device number differs" msgstr "Seadme numbrid on erinevad" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Kontroll " -#: src/compare.c:471 -#, fuzzy, c-format +#: src/compare.c:473 +#, c-format msgid "%s: Unknown file type '%c', diffed as normal file" -msgstr "%s: Tundmatu failitüüp '%c', võrdlen tavalise failina" +msgstr "%s: Tundmatu failitüüp '%c', võrdlen tavalise failina" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "Arhiiv sisaldab eemaldatud prefiksitega failinimesid." -#: src/compare.c:533 +#: src/compare.c:535 msgid "Archive contains transformed file names." msgstr "Arhiiv sisaldab teisendatud faili nimesid." -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "Kontrollimine ei pruugi leida algseid faile." -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" -msgstr[0] "VIGA KONTROLLIMISEL: leiti %d vigast päist" -msgstr[1] "VIGA KONTROLLIMISEL: leiti %d vigast päist" +msgstr[0] "VIGA KONTROLLIMISEL: leiti %d vigast päist" +msgstr[1] "VIGA KONTROLLIMISEL: leiti %d vigast päist" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" -msgstr "Üksik null blokk kohal %s" +msgstr "Ãœksik null blokk kohal %s" #: src/create.c:73 #, c-format msgid "%s: contains a cache directory tag %s; %s" -msgstr "%s: sisaldab vahemälu kataloogi lipikut %s; %s" +msgstr "%s: sisaldab vahemälu kataloogi lipikut %s; %s" #: src/create.c:262 #, c-format msgid "value %s out of %s range %s..%s; substituting %s" -msgstr "väärtus %s on %s piiridest %s..%s väljas; asendan %s" +msgstr "väärtus %s on %s piiridest %s..%s väljas; asendan %s" #: src/create.c:268 #, c-format msgid "value %s out of %s range %s..%s" -msgstr "väärtus %s on %s piiridest %s..%s väljas" +msgstr "väärtus %s on %s piiridest %s..%s väljas" #: src/create.c:328 msgid "Generating negative octal headers" -msgstr "Genereerin negatiivsed kaheksand päised" +msgstr "Genereerin negatiivsed kaheksand päised" #: src/create.c:601 src/create.c:664 #, c-format @@ -928,69 +936,69 @@ msgstr "%s: viite nimi on liiga pikk; ei salvesta" #, c-format msgid "%s: File shrank by %s byte; padding with zeros" msgid_plural "%s: File shrank by %s bytes; padding with zeros" -msgstr[0] "%s: Fail lühenes %s baiti; täidan nullidega" -msgstr[1] "%s: Fail lühenes %s baiti; täidan nullidega" +msgstr[0] "%s: Fail lühenes %s baiti; täidan nullidega" +msgstr[1] "%s: Fail lühenes %s baiti; täidan nullidega" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" -msgstr "%s: fail on teises failisüsteemis; ei salvesta" +msgstr "%s: fail on teises failisüsteemis; ei salvesta" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "sisu ei salestata" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" -msgstr "%s: Tundmatu failitüüp; ignoreerin seda faili" +msgstr "%s: Tundmatu failitüüp; ignoreerin seda faili" -#: src/create.c:1549 +#: src/create.c:1551 #, c-format msgid "Missing links to %s." msgstr "%s-le puudub viiteid." -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: pole muutunud; ei salvesta" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s on arhiiv; ei salvesta" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "kataloogi ei salvestatud" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: fail muutus lugemisel" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: ignoreerin pesa" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: ignoreerin ust" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" -msgstr "Hüppan järgmise päiseni" +msgstr "Hüppan järgmise päiseni" #: src/delete.c:284 msgid "Deleting non-header from archive" -msgstr "Kustutan arhiivist mitte-päise" +msgstr "Kustutan arhiivist mitte-päise" #: src/extract.c:302 #, c-format msgid "%s: implausibly old time stamp %s" -msgstr "%s: ebatõenäoliselt vana ajatempel %s" +msgstr "%s: ebatõenäoliselt vana ajatempel %s" #: src/extract.c:320 #, c-format @@ -1000,59 +1008,59 @@ msgstr "%s: ajatempel %s on %s sekundit tulevikus" #: src/extract.c:536 #, c-format msgid "%s: Unexpected inconsistency when making directory" -msgstr "%s: Ootamatu kooskõlalisuse probleem kataloogi loomisel" +msgstr "%s: Ootamatu kooskõlalisuse probleem kataloogi loomisel" #: src/extract.c:705 #, c-format msgid "%s: skipping existing file" -msgstr "" +msgstr "%s: jätan olemasoleva faili vahele" #: src/extract.c:821 #, c-format msgid "%s: Directory renamed before its status could be extracted" -msgstr "%s: Kataloog nimetati ümber, enne kui sai loetud tema olek" +msgstr "%s: Kataloog nimetati ümber, enne kui sai loetud tema olek" #: src/extract.c:1010 msgid "Extracting contiguous files as regular files" -msgstr "Taastan jätkuvad failid kui tavalised" +msgstr "Taastan jätkuvad failid kui tavalised" #: src/extract.c:1365 msgid "Attempting extraction of symbolic links as hard links" -msgstr "Üritan taastada nimeviiteid viidetena" +msgstr "Ãœritan taastada nimeviiteid viidetena" #: src/extract.c:1528 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" -msgstr "%s: Ei saa taastada -- fail jätkub teisel volüümil" +msgstr "%s: Ei saa taastada -- fail jätkub teisel volüümil" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" -msgstr "Ootamatu pika nime päis" +msgstr "Ootamatu pika nime päis" #: src/extract.c:1542 -#, fuzzy, c-format +#, c-format msgid "%s: Unknown file type '%c', extracted as normal file" -msgstr "%s: Tundmatu failitüüp `%c', taastan tavalise failina" +msgstr "%s: Tundmatu failitüüp '%c', taastan tavalise failina" #: src/extract.c:1568 #, c-format msgid "Current %s is newer or same age" -msgstr "Olemasolev %s on uuem või sama kuupäevaga" +msgstr "Olemasolev %s on uuem või sama kuupäevaga" #: src/extract.c:1620 #, c-format msgid "%s: Was unable to backup this file" -msgstr "%s: Selle faili varundamine ebaõnnestus" +msgstr "%s: Selle faili varundamine ebaõnnestus" #: src/extract.c:1767 #, c-format msgid "Cannot rename %s to %s" -msgstr "%s ei õnnestu ümber nimetada %s-ks" +msgstr "%s ei õnnestu ümber nimetada %s-ks" #: src/incremen.c:494 src/incremen.c:536 #, c-format msgid "%s: Directory has been renamed from %s" -msgstr "%s: Kataloog %s on ümber nimetatud" +msgstr "%s: Kataloog %s on ümber nimetatud" #: src/incremen.c:549 #, c-format @@ -1060,342 +1068,341 @@ msgid "%s: Directory is new" msgstr "%s: Kataloog on uus" #: src/incremen.c:566 -#, fuzzy, c-format +#, c-format msgid "%s: directory is on a different filesystem; not dumped" -msgstr "%s: fail on teises failisüsteemis; ei salvesta" +msgstr "%s: kataloog on teises failisüsteemis; ei salvesta" #: src/incremen.c:587 #, c-format msgid "%s: Directory has been renamed" -msgstr "%s: Kataloog on ümber nimetatud" +msgstr "%s: Kataloog on ümber nimetatud" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "Vigane ajatempel" -#: src/incremen.c:1045 -#, fuzzy +#: src/incremen.c:1047 msgid "Invalid modification time" -msgstr "Vigane muutmise aeg (sekundid)" +msgstr "Vigane muutmise aeg" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "Vigane muutmise aeg (nanosekundid)" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "Vigane seadmenumber" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Vigane i-kirje number" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" -msgstr "" +msgstr "%s: bait %s: %s %.*s... on liiga pikk" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" -msgstr "Ootamatu snapshoti faili lõpp" +msgstr "Ootamatu snapshoti faili lõpp" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" -msgstr "" +msgstr "%s: baidile %s: %s %s järgneb vigane bait 0x%02x" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" +"%s: bait %s: (lubatud vahemik %s..%s)\n" +"\t%s %s" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" -msgstr "" +msgstr "%s: bait %s: %s %s" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" -msgstr "" +msgstr "%s: bait %s: %s" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" -msgstr "Puudub kirje lõpetaja" +msgstr "Puudub kirje lõpetaja" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "Inkrementaalse faili vorming on vigane" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "Mittetoetatud inkrementaalse vormingu versioon: %" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Vigane taastamise kataloog: eeldasin '%c', sain %#3o" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Vigane taastamise kataloog: dubleeritud 'X'" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" -msgstr "Vigane taastamise kataloog: tühi nimi 'R' väljal" +msgstr "Vigane taastamise kataloog: tühi nimi 'R' väljal" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Vigane taastamise kataloog: 'R' ei ole 'T' ees" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" -msgstr "Vigane taastamise kataloog: tühi nimi 'T' väljal" +msgstr "Vigane taastamise kataloog: tühi nimi 'T' väljal" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "Vigane taastamise kataloog: ootasin '%c', aga andmed said otsa" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "Vigane taastamise kataloog: 'X' ei kasutata" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Vormiga %s ei saa ajutist kataloogi luua" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" -msgstr "%s: Ei puhasta kataloogi: stat ebaõnnestus" +msgstr "%s: Ei puhasta kataloogi: stat ebaõnnestus" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: kataloog on teisel seadmel; ei puhasta" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Kustutan %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: Ei saa eemaldada" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" -msgstr "%s: Jätan vahele" +msgstr "%s: Jätan vahele" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "blokk %s: ** NULlide blokk **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" -msgstr "blokk %s: ** Faili lõpp **\n" +msgstr "blokk %s: ** Faili lõpp **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "blokk %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" -msgstr "Tühjad väljad päises kohtadel, kus eeldati numbrit %s" +msgstr "Tühjad väljad päises kohtadel, kus eeldati numbrit %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" -"Arhiivi kaheksandväärtus %.*s on %s piiridest väljas; eeldan kahe täiendit" +"Arhiivi kaheksandväärtus %.*s on %s piiridest väljas; eeldan kahe täiendit" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" -msgstr "Arhiivi kaheksandväärtus %.*s on %s piiridest väljas" +msgstr "Arhiivi kaheksandväärtus %.*s on %s piiridest väljas" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" -msgstr "Arhiiv sisaldab aegunuid base-64 päiseid" +msgstr "Arhiiv sisaldab aegunuid base-64 päiseid" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" -msgstr "Arhiivi märgiga base-64 sõne %s on %s piiridest väljas" +msgstr "Arhiivi märgiga base-64 sõne %s on %s piiridest väljas" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" -msgstr "Arhiivi base-256 väärtus on %s piiridest väljas" +msgstr "Arhiivi base-256 väärtus on %s piiridest väljas" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Arhiiv sisaldab %.*s, eeldati numbrit %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" -msgstr "Arhiivi väärtus %s on %s piiridest %s..%s väljas" +msgstr "Arhiivi väärtus %s on %s piiridest %s..%s väljas" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " viide %s-le\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" -msgstr " tundmatu failitüüp %s\n" +msgstr " tundmatu failitüüp %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--Pikk viide--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--Pikk nimi--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" -msgstr "--Volüümi päis--\n" +msgstr "--Volüümi päis--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" -msgstr "--Jätkub baidilt %s--\n" +msgstr "--Jätkub baidilt %s--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Loon kataloogi:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "Annan %s uueks nimeks %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" -msgstr "%s: ei õnnestu ümber nimetada %s-ks" +msgstr "%s: ei õnnestu ümber nimetada %s-ks" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "Nimetan `%s' tagasi `%s'\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Fail kustutati enne lugemist" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "alamprotsess" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "protsessidevaheline kanal" #: src/names.c:360 -#, fuzzy msgid "command line" -msgstr "%s käsklus sai vea" +msgstr "käsurida" #: src/names.c:378 -#, fuzzy, c-format +#, c-format msgid "%s: file list requested from %s already read from %s" -msgstr "%s: failide nimekiri on juba loetud" +msgstr "%s: %s loetud failide nimekiri on juba loetud failist %s" -#: src/names.c:448 -#, fuzzy, c-format +#: src/names.c:448 src/checkpoint.c:274 +#, c-format msgid "cannot split string '%s': %s" -msgstr "ei õnnestu seada `%s' aega" +msgstr "sõne '%s' ei saa tükeldada: %s" #: src/names.c:490 #, c-format msgid "%s: file name read contains nul character" -msgstr "%s: loetud faili nimi sisaldab sümbolit nul" +msgstr "%s: loetud faili nimi sisaldab sümbolit nul" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" -msgstr "Failide nimedes on jokkersümbolid" +msgstr "Failide nimedes on jokkersümbolid" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" -"Jokkerite lubamiseks kasutage --wildcars või --no-wildcards selle teate " +"Jokkerite lubamiseks kasutage --wildcars või --no-wildcards selle teate " "blokeerimiseks" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: Puudub arhiivis" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" -msgstr "%s: Nõutud eksemplar puudub arhiivis" +msgstr "%s: Nõutud eksemplar puudub arhiivis" -#: src/names.c:876 +#: src/names.c:879 #, c-format msgid "Archive label mismatch" -msgstr "Arhiivi märgend ei sobi" +msgstr "Arhiivi märgend ei sobi" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" -msgstr "--listed-incremental ei luba faili loendis võtit -C kasutada" +msgstr "--listed-incremental ei luba faili loendis võtit -C kasutada" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" -msgstr "Võti --listed-incremental lubab ainult ühte -C kasutamist" +msgstr "Võti --listed-incremental lubab ainult ühte -C kasutamist" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" -msgstr "Mõlemad võtmed - `-%s' ja `-%s' eeldavad standard sisendit" +msgid "Options '%s' and '%s' both want standard input" +msgstr "Mõlemad võtmed, '-%s' ja '-%s' eeldavad standard sisendit" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s: Vigane arhiivi vorming" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "Arhiivi formaat ei toeta GNU laiendusi" -#: src/tar.c:255 -#, fuzzy, c-format +#: src/tar.c:264 +#, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." msgstr "" -"Tundmatu kvootimise stiil `%s'. Loendi saate käsuga `%s --quoting-style=help'" +"Tundmatu kvootimise stiil '%s'. Loendi saate käsuga '%s --quoting-style=help'" -#: src/tar.c:364 -#, fuzzy +#: src/tar.c:378 msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1405,16 +1412,15 @@ msgid "" " tar -tvf archive.tar # List all files in archive.tar verbosely.\n" " tar -xf archive.tar # Extract all files from archive.tar.\n" msgstr "" -"GNU `tar' salvestab failid ühte lindi või ketta faili arhiivi ja taastab\n" -"arhiivist üksikuid faile.\n" +"GNU 'tar' salvestab failid ühte lindi või ketta faili arhiivi ja taastab\n" +"arhiivist üksikuid faile.\n" "\n" -"Näiteid:\n" +"Näiteid:\n" " tar -cf arhiiv.tar foo bar # Loo arhiiv.tar failidest foo ja bar.\n" -" tar -tvf arhiiv.tar # Anna arhiiv.tar sisust täielik ülevaade.\n" -" tar -xf arhiiv.tar # Taasta kõik failid arhiivist arhiiv.tar.\n" +" tar -tvf arhiiv.tar # Anna arhiiv.tar sisust täielik ülevaade.\n" +" tar -xf arhiiv.tar # Taasta kõik failid arhiivist arhiiv.tar.\n" -#: src/tar.c:373 -#, fuzzy +#: src/tar.c:387 msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" "The version control may be set with --backup or VERSION_CONTROL, values " @@ -1425,8 +1431,8 @@ msgid "" " nil, existing numbered if numbered backups exist, simple otherwise\n" " never, simple always make simple backups\n" msgstr "" -"Varukoopia lõpp on `~', kui pole antud --suffix või SIMPLE_BACKUP_SUFFIX.\n" -"Versiooni kontrolli võib määrata --backup või VERSION_CONTROL, väärtused " +"Varukoopia lõpp on '~', kui pole antud --suffix või SIMPLE_BACKUP_SUFFIX.\n" +"Versiooni kontrolli võib määrata --backup või VERSION_CONTROL, väärtused " "on:\n" "\n" " none, off varukoopiat ei loo\n" @@ -1434,842 +1440,861 @@ msgstr "" " nil, existing nummerdatud kui koopiad on nummerdatud, muidu lihtne\n" " never, simple tee ainult lihtne koopia\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" -msgstr "Põhiline töö:" +msgstr "Põhiline töö:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" -msgstr "näita arhiivi sisukorda" +msgstr "näita arhiivi sisukorda" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "taasta failid arhiivist" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "loo uus arhiiv" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" -msgstr "otsi arhiivi ja failisüsteemi erinevusi" +msgstr "otsi arhiivi ja failisüsteemi erinevusi" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" -msgstr "lisa failid arhiivi lõppu" +msgstr "lisa failid arhiivi lõppu" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "lisa arhiivi ainult failid uuemad kui arhiivis" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "lisa tar failid arhiivi" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "kustuta arhiivist (mitte magnetlindilt!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" -msgstr "testi arhiivi volüümi märgendit ja lõpeta töö" +msgstr "testi arhiivi volüümi märgendit ja lõpeta töö" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" -msgstr "Töö täpsustamine:" +msgstr "Töö täpsustamine:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" -msgstr "tööta aukudega failidega efektiivsemalt" +msgstr "tööta aukudega failidega efektiivsemalt" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" -msgstr "PÕHI[.ALAM]" +msgstr "PÕHI[.ALAM]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" -msgstr "määra aukudega faili vormingu versioon (eeldab võtit --sparse)" +msgstr "määra aukudega faili vormingu versioon (eeldab võtit --sparse)" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" -msgstr "käsitle vana GNU vormingus inkrementaalset koopiat" +msgstr "käsitle vana GNU vormingus inkrementaalset koopiat" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" -msgstr "käsitle uue GNU vormingu inkrementaalset koopiat" +msgstr "käsitle uue GNU vormingu inkrementaalset koopiat" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "loodud listed-incremental arhiivi dump tase" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" -msgstr "ära lõpeta loetamatute failide korral veakoodiga" +msgstr "ära lõpeta loetamatute failide korral veakoodiga" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" "diff, --extract or --list and when a list of files is given either on the " "command line or via the -T option; NUMBER defaults to 1" msgstr "" -"töötle ainult N-dat esinemist arhiivi igast failist. See võti on lubatud " +"töötle ainult N-dat esinemist arhiivi igast failist. See võti on lubatud " "ainult\n" -"käskudega --delete, --diff, --extract või --list ja kui failide loend on " +"käskudega --delete, --diff, --extract või --list ja kui failide loend on " "antud\n" -"käsureal või võtmega -T. Vaikimisi N on 1." +"käsureal või võtmega -T. Vaikimisi N on 1." -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "arhiiv on positsioneeritav" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "arhiiv ei ole positsioneeritav" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" -msgstr "inkrementaalsete arhiivide loomisel ära kontrolli seadmete numbreid" +msgstr "inkrementaalsete arhiivide loomisel ära kontrolli seadmete numbreid" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" "inkrementaalsete arhiivide loomisel kontrolli seadmete numbreid (vaikimisi)" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" -msgstr "Ülekirjutamise juhtimine:" +msgstr "Ãœlekirjutamise juhtimine:" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "kontrolli arhiivi peale arhiivi kirjutamist" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "kustuta failid peale arhiveerimist" -#: src/tar.c:471 -#, fuzzy +#: src/tar.c:485 msgid "don't replace existing files when extracting, treat them as errors" -msgstr "olemasolevaid faile taastamisel üle ei kirjuta" +msgstr "olemasolevaid faile taastamisel üle ei kirjuta, anna vigu" -#: src/tar.c:474 -#, fuzzy +#: src/tar.c:488 msgid "don't replace existing files when extracting, silently skip over them" -msgstr "olemasolevaid faile taastamisel üle ei kirjuta" +msgstr "" +"olemasolevaid faile taastamisel üle ei kirjuta, jäta need vaikselt vahele" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" -msgstr "ära kirjuta üle olemasolevaid faile, mis on uuemad kui arhiveeritud" +msgstr "ära kirjuta üle olemasolevaid faile, mis on uuemad kui arhiveeritud" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" -msgstr "kirjuta olemasolevad failid üle" +msgstr "kirjuta olemasolevad failid üle" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "kustuta fail enne taastamist" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "kustuta hierarhia enne kataloogi taastamist" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" -msgstr "säilita olemasolevate kataloogide metainfo" +msgstr "säilita olemasolevate kataloogide metainfo" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" -msgstr "taastamisel kirjuta olemasolevate kataloogide metainfo üle (vaikimisi)" +msgstr "taastamisel kirjuta olemasolevate kataloogide metainfo üle (vaikimisi)" -#: src/tar.c:490 -#, fuzzy +#: src/tar.c:504 msgid "preserve existing symlinks to directories when extracting" -msgstr "kirjuta olemasolevad failid üle" +msgstr "taastamisel säilita olemasolevad nimeviited kataloogidele" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "KAT" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" -msgstr "Vali väljundvoog:" +msgstr "Vali väljundvoog:" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" -msgstr "taasta failid standardväljundisse" +msgstr "taasta failid standardväljundisse" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" -msgstr "KÄSK" +msgstr "KÄSK" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" -msgstr "taasta failid läbi toru teise programmi" +msgstr "taasta failid läbi toru teise programmi" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" -msgstr "ignoreeri alamprotsesside lõpetamise koode" +msgstr "ignoreeri alamprotsesside lõpetamise koode" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" -msgstr "käsitle alamprotsesside nullist erinevaid lõpetamise koode veana" +msgstr "käsitle alamprotsesside nullist erinevaid lõpetamise koode veana" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" -msgstr "Faili atribuutide käsitlemine:" +msgstr "Faili atribuutide käsitlemine:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "kasuta NIMEe kui lisatud failide omanikku" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "kasuta NIMEe kui lisatud failide gruppi" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" -msgstr "KUUP-VÕI-FAIL" +msgstr "KUUP-VÕI-FAIL" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" -msgstr "sea lisatud failide muutmise ajaks KUUP-VÕI-FAIL" +msgstr "sea lisatud failide muutmise ajaks KUUP-VÕI-FAIL" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "MUUTUSED" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" -msgstr "kasuta lisatud failidel sümbol moodi MUUTUSED" +msgstr "kasuta lisatud failidel sümbol moodi MUUTUSED" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "MEETOD" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " "place (METHOD='system')" msgstr "" -"säilita salvestatud failide kasutamise aeg, kas taastades selle peale " -"lugemist (METHOD='replace'; vaikimisi) või ei muuda kasutamise aega üldse " +"säilita salvestatud failide kasutamise aeg, kas taastades selle peale " +"lugemist (METHOD='replace'; vaikimisi) või ei muuda kasutamise aega üldse " "(METHOD='system')" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" -msgstr "ära taasta faili muutmise aega" +msgstr "ära taasta faili muutmise aega" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" msgstr "" -"ürita failide taastamisel säilitada failide omanikud arhiivis (root " +"ürita failide taastamisel säilitada failide omanikud arhiivis (root " "kasutajal vaikimisi)" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" -msgstr "taasta failid enda õigustes (tavakasutajatel vaikimisi)" +msgstr "taasta failid enda õigustes (tavakasutajatel vaikimisi)" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "kasuta kasutaja/grupp numbreid" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" -msgstr "taasta ka info failide õigustest (vaikimisi superkasutaja korral)" +msgstr "taasta ka info failide õigustest (vaikimisi superkasutaja korral)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -"õiguste taastamisel kasuta kasutaja umask väärtust (vaikimisi " +"õiguste taastamisel kasuta kasutaja umask väärtust (vaikimisi " "tavakasutajatel)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" -msgstr "" +msgstr "liikmete argumendid näidatakse samas järjekorras nagu failid arhiivis" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "sama, kui -p ja -s" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" -msgstr "oota muutmise aegade ja õiguste taastamisega taastamise lõpuni" +msgstr "oota muutmise aegade ja õiguste taastamisega taastamise lõpuni" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" -msgstr "katkesta --delay-directory-restore võtme mõju" +msgstr "katkesta --delay-directory-restore võtme mõju" -#: src/tar.c:554 -#, fuzzy +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 msgid "Handling of extended file attributes:" -msgstr "Faili atribuutide käsitlemine:" +msgstr "Faili laiendatud atribuutide käsitlemine:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" -msgstr "" +msgstr "Luba laiendatud atribuutide tugi" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" -msgstr "" +msgstr "Keela laiendatud atribuutide tugi" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" -msgstr "" +msgstr "MASK" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" -msgstr "" +msgstr "määrake xattr lubatud võtmete muster" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" -msgstr "" +msgstr "määrake xattr välistatud võtmete muster" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" -msgstr "" +msgstr "Luba SELinux konteksti tugi" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" -msgstr "" +msgstr "Keela SELinux konteksti tugi" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" -msgstr "" +msgstr "Luba POSIX ACL tugi" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" -msgstr "" +msgstr "Keela POSIX ACL tugi" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "Seadme valik ja vahetamine:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ARHIIV" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" -msgstr "kasuta arhiivi faili või seadet ARHIIV" +msgstr "kasuta arhiivi faili või seadet ARHIIV" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "arhiivi fail on lokaalne isegi kui sisaldab koolonit" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" -msgstr "kasuta rmt asemel antud käsku" +msgstr "kasuta rmt asemel antud käsku" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" -msgstr "kasuta rsh asemel antud käsku" +msgstr "kasuta rsh asemel antud käsku" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" -msgstr "määra seade ja tihedus" +msgstr "määra seade ja tihedus" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" -msgstr "loo/näita/taasta mitme volüümilisi arhiive" +msgstr "loo/näita/taasta mitme volüümilisi arhiive" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "vaheta peale NUMBER x 1024 baidi kirjutamist linti" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" -msgstr "käivita iga lindi lõpus skript (eeldab võtit -M)" +msgstr "käivita iga lindi lõpus skript (eeldab võtit -M)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" -msgstr "kasuta/uuenda volüümi numbrit failis FAIL" +msgstr "kasuta/uuenda volüümi numbrit failis FAIL" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "Seadme blokkimine:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "BLOKKE" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "BLOKKE x 512 baiti kirjele" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "NUMBER baiti kirjele, 512 kordne" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" -msgstr "ignoreeri null blokke arhiivis (tähistab EOF)" +msgstr "ignoreeri null blokke arhiivis (tähistab EOF)" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "bloki lugemisel uuesti (4.2BSD torude jaoks)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "Arhiivi vormingu valikud:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "VORMING" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "loo arhiiv antud vormingus" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" -msgstr "VORMING on üks järgnevaist:" +msgstr "VORMING on üks järgnevaist:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "vana V7 tar vorming" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "GNU vorming tar <= 1.12 korral" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x vorming" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) vorming" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) vorming" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "sama, kui pax" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "sama, kui --format=v7" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "sama, kui --format=posix" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." -msgstr "võtmesõna[[:]=väärtus][,võtmesõna[[:]=väärtus]...]" +msgstr "võtmesõna[[:]=väärtus][,võtmesõna[[:]=väärtus]...]" -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" -msgstr "pax võtmesõnade kasutamine" +msgstr "pax võtmesõnade kasutamine" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "TEKST" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -"loo arhiivi volüümi nimega NIMI. Listingu/taastamise ajal kasuta TEKSTi " +"loo arhiivi volüümi nimega NIMI. Listingu/taastamise ajal kasuta TEKSTi " "otsingumustrina" -#: src/tar.c:660 +#: src/tar.c:684 msgid "Compression options:" -msgstr "Tihendamise võtmed:" +msgstr "Tihendamise võtmed:" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "tihendamisprogrammi tuvastamiseks kasuta arhiivi sufiksit" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" -msgstr "tihendamisprogrammi tuvastamiseks ära kasuta arhiivi sufiksit" +msgstr "tihendamisprogrammi tuvastamiseks ära kasuta arhiivi sufiksit" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "PROG" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" -msgstr "filtreeri läbi programmi (peab lubama võtit -d)" +msgstr "filtreeri läbi programmi (peab lubama võtit -d)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "Lokaalse faili valik:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "lisa antud FAIL arhiivi (kasulik, kui faili nimi algab kriipsuga)" -#: src/tar.c:687 -msgid "DIR" -msgstr "KAT" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "mine kataloogi KAT" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" -msgstr "loe taastatavate või varundatavate failide nimed failist NIMI" +msgstr "loe taastatavate või varundatavate failide nimed failist NIMI" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" -msgstr "-T loeb nullidega lõpetatud nimesid, blokeeri -C" +msgstr "-T loeb nullidega lõpetatud nimesid, blokeeri -C" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" -msgstr "blokeeri eelmise --null võtme mõju" +msgstr "blokeeri eelmise --null võtme mõju" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" -msgstr "eemalda -T võtmega loetud failinimedest kvootimissümbolid (vaikimisi)" +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" +msgstr "eemalda -T võtmega loetud failinimedest kvootimissümbolid (vaikimisi)" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" -msgstr "ära eemalda -T võtmega loetud failinimedest kvootimissümboleid" +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" +msgstr "ära eemalda -T võtmega loetud failinimedest kvootimissümboleid" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "MUSTER" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" -msgstr "MUSTRI järgi välistatud failid" +msgstr "MUSTRI järgi välistatud failid" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" -msgstr "välistavad mustrid on FAILIS" +msgstr "välistavad mustrid on FAILIS" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -"välista kataloogide, mis sisaldavad CACHEDIR.TAG, sisu, välja arvatud " -"märgendi fail ise" +"välista kataloogide, mis sisaldavad CACHEDIR.TAG, sisu, välja arvatud " +"märgendi fail ise" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" -msgstr "välista kõik kataloogis, mis sisaldab CACHEDIR.TAG" +msgstr "välista kõik kataloogis, mis sisaldab CACHEDIR.TAG" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" -msgstr "välista kataloogid, mis sisaldavad CACHEDIR.TAG" +msgstr "välista kataloogid, mis sisaldavad CACHEDIR.TAG" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -"välista kataloogide, mis sisaldavad faili FAIL, sisu, välja arvatud FAIL ise" +"välista kataloogide, mis sisaldavad faili FAIL, sisu, välja arvatud FAIL ise" + +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" -#: src/tar.c:715 +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" -msgstr "välista kataloogid, mis sisaldavad faili FAIL" +msgstr "välista kataloogid, mis sisaldavad faili FAIL" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" -msgstr "välista kataloogid, mis sisaldavad faili FAIL" +msgstr "välista kataloogid, mis sisaldavad faili FAIL" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" -msgstr "välista versiooni kontrolli süsteemi kataloogid" +msgstr "välista versiooni kontrolli süsteemi kataloogid" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" -msgstr "välista varukoopiad ja lukufailid" +msgstr "välista varukoopiad ja lukufailid" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" -msgstr "ära sisene kataloogidesse" +msgstr "ära sisene kataloogidesse" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" -msgstr "püsi arhiivi loomise ajal kohalikus failisüsteemis" +msgstr "püsi arhiivi loomise ajal kohalikus failisüsteemis" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "sisene kataloogidesse (vaikimisi)" -#: src/tar.c:729 -#, fuzzy +#: src/tar.c:761 msgid "don't strip leading '/'s from file names" -msgstr "ära eemalda faili nimedelt prefiksit `/'" +msgstr "ära eemalda faili nimedelt prefiksit '/'" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" -msgstr "järgi nimeviiteid; arhiveeri ja taasta viidatavad failid" +msgstr "järgi nimeviiteid; arhiveeri ja taasta viidatavad failid" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" -msgstr "järgi viiteid; arhiveeri ja taasta viidatavad failid" +msgstr "järgi viiteid; arhiveeri ja taasta viidatavad failid" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "KOMPONENT" -#: src/tar.c:735 -#, fuzzy +#: src/tar.c:767 msgid "begin at member MEMBER-NAME when reading the archive" -msgstr "alusta arhiivi liikmest KOMPONENT" +msgstr "alusta arhiivi lugemisel liikmest KOMPONENT" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" -msgstr "salvesta ainult failid mis on uuemad kui KUUP-VÕI-FAIL" +msgstr "salvesta ainult failid mis on uuemad kui KUUP-VÕI-FAIL" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" -msgstr "KUUPÄEV" +msgstr "KUUPÄEV" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" -msgstr "võrdle kuupäevi ainult kui andmed on muutunud" +msgstr "võrdle kuupäevi ainult kui andmed on muutunud" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "KONTROLL" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "loo enne eemaldamist varukoopia, vali versioonikontroll" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" -msgstr "SÕNE" +msgstr "SÕNE" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -"varunda enne kustutamist, kasuta uut lõppu (vaikimisi '~', kui pole üle " -"määratud keskkonnamuutujaga SIMPLE_BACKUP_SUFFIX)" +"varunda enne kustutamist, kasuta uut lõppu (vaikimisi '~', kui pole üle " +"määratud keskkonnamuutujaga SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "Failide nimede muutmine:" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "eemalda taastamisel failide nimede algusest NUMBER komponenti" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "AVALDIS" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "kasuta failide nimede muutmiseks sed asendus avaldist" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" -msgstr "Failinimede otsimine (mõjutab nii kaasamist, kui välistamist):" +msgstr "Failinimede otsimine (mõjutab nii kaasamist, kui välistamist):" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" -msgstr "tõstutundetu" +msgstr "tõstutundetu" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "mustrid alustavad faili nime algusest" -#: src/tar.c:767 -#, fuzzy +#: src/tar.c:799 msgid "patterns match after any '/' (default for exclusion)" -msgstr "mustrid toimivad iga / järel (välistamise korral vaikimisi)" +msgstr "mustrid toimivad iga '/' järel (välistamise korral vaikimisi)" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" -msgstr "tõstutundlik otsimine (vaikimisi)" +msgstr "tõstutundlik otsimine (vaikimisi)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" -msgstr "kasuta jokkersümboleid (välistamise korral vaikimisi)" +msgstr "kasuta jokkersümboleid (välistamise korral vaikimisi)" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" -msgstr "täht-täheline sõne otsimine" +msgstr "täht-täheline sõne otsimine" -#: src/tar.c:775 -#, fuzzy +#: src/tar.c:807 msgid "wildcards do not match '/'" msgstr "jokkerid ei leia '/'" -#: src/tar.c:777 -#, fuzzy +#: src/tar.c:809 msgid "wildcards match '/' (default for exclusion)" -msgstr "jokkersümbolid leiavad '/' (välistamise korral vaikimisi)" +msgstr "jokkersümbolid leiavad '/' (välistamise korral vaikimisi)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Informatsioon:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" -msgstr "väljasta töödeldavate failide kohta infot" +msgstr "väljasta töödeldavate failide kohta infot" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" -msgstr "VÕTMESÕNA" +msgstr "VÕTMESÕNA" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "hoiatuste juhtimine" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" -msgstr "anna töö kohta infot iga NUMBER kirje järel (vaikimisi 10)" +msgstr "anna töö kohta infot iga NUMBER kirje järel (vaikimisi 10)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "TEGEVUS" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" -msgstr "käivita tegevus igas kontrollpunktis" +msgstr "käivita tegevus igas kontrollpunktis" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" -msgstr "väljasta teade, kui kõike viiteid pole salvestatud" +msgstr "väljasta teade, kui kõike viiteid pole salvestatud" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "SIGNAAL" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " "SIGQUIT, SIGINT, SIGUSR1 and SIGUSR2; the names without SIG prefix are also " "accepted" msgstr "" -"väljasta peale arhiivi töötlemist baitide koguarv, argumendi korral - " -"väljasta see info, kui saadetakse antud signaal. Lubatud signaalid on: " -"SIGHUP, SIGQUIT, SIGINT, SIGUSR1 ja SIGUSR2; SIG prefiksi võib ära jätta" +"väljasta peale arhiivi töötlemist baitide koguarv, argumendi korral - " +"väljasta see info, kui saadetakse antud signaal. Lubatud signaalid on: " +"SIGHUP, SIGQUIT, SIGINT, SIGUSR1 ja SIGUSR2; SIG prefiksi võib ära jätta" -#: src/tar.c:802 +#: src/tar.c:834 msgid "print file modification times in UTC" -msgstr "väljasta failide muutmise ajad UTC esituses" +msgstr "väljasta failide muutmise ajad UTC esituses" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" -msgstr "väljasta faili aeg täielikult" +msgstr "väljasta faili aeg täielikult" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" -msgstr "salvesta täiendav info FAILi" +msgstr "salvesta täiendav info FAILi" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" -msgstr "näita iga teatega ka arhiivi bloki numbrit" +msgstr "näita iga teatega ka arhiivi bloki numbrit" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" -msgstr "küsi iga tegevuse kohta kinnitust" +msgstr "küsi iga tegevuse kohta kinnitust" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" -msgstr "näita tar vaikeseadeid" +msgstr "näita tar vaikeseadeid" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" -msgstr "" +msgstr "näita snapshot-faili väljade lubatud vahemikud" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -"listingu või taastamise ajal, näita igat kataloogi mis ei vasta " +"listingu või taastamise ajal, näita igat kataloogi mis ei vasta " "otsingutingimustele" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" -msgstr "peale teisendamist näita faili või arhiivi nime" +msgstr "peale teisendamist näita faili või arhiivi nime" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "STIIL" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" -msgstr "määra nimede kvootimise stiil; lubatud väärtused on toodud allpool" +msgstr "määra nimede kvootimise stiil; lubatud väärtused on toodud allpool" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" -msgstr "lisaks kvoodi sõnes näidatud sümbolid" +msgstr "lisaks kvoodi sõnes näidatud sümbolid" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" -msgstr "keela sõnes toodud sümbolite kvootimine" +msgstr "keela sõnes toodud sümbolite kvootimine" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" -msgstr "Ühilduvuse võtmed:" +msgstr "Ãœhilduvuse võtmed:" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "loomisel sama kui --old-archive. Taastamisel sama kui --no-same-owner" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" -msgstr "Muud võtmed:" +msgstr "Muud võtmed:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" -msgstr "blokeeri potentsiaalselt ohtlikud võtmed" +msgstr "blokeeri potentsiaalselt ohtlikud võtmed" -#: src/tar.c:978 -#, fuzzy +#: src/tar.c:1010 msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" msgstr "" -"Korraga võib kasutada ainult ühte võtmetest `-Acdtrux' või `--test-label'" +"Korraga võib kasutada ainult ühte võtmetest '-Acdtrux' või '--test-label'" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" -msgstr "Konfliktsed pakkimisvõtmed" +msgstr "Konfliktsed pakkimisvõtmed" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "Tundmatu signaali nimi: %s" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" -msgstr "Kuupäeva fail puudub" +msgstr "Kuupäeva fail puudub" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Kasutan %s tundmatu ajaformaadi %s asemel" -#: src/tar.c:1108 -#, fuzzy, c-format +#: src/tar.c:1140 +#, c-format msgid "Option %s: Treating date '%s' as %s" -msgstr "Võti %s: Käsitlen aega `%s' kui %s" +msgstr "Võti %s: Käsitlen aega '%s' kui %s" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" -msgstr "filtreeri arhiiv läbi %s" +msgstr "filtreeri arhiiv läbi %s" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" -msgstr "Võtmega --quoting-style on lubatud järgnevad argumendid:" +msgstr "Võtmega --quoting-style on lubatud järgnevad argumendid:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2277,297 +2302,284 @@ msgstr "" "\n" "*See* tar kasutab vaikimisi:\n" -#: src/tar.c:1295 -#, fuzzy +#: src/tar.c:1330 msgid "Invalid owner or group ID" -msgstr "Vigane omanik" +msgstr "Vigane omanik või grupi ID" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Vigane blokkimisfaktor" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "Vigane lindi pikkus" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" -msgstr "Inkrementaalse varunduse taseme väärtus on vigane" +msgstr "Inkrementaalse varunduse taseme väärtus on vigane" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" -msgstr "Rohkem kui üks etteantud aeg" +msgstr "Rohkem kui üks etteantud aeg" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" -msgstr "Vigane aukudega faili versiooni väärtus" +msgstr "Vigane aukudega faili versiooni väärtus" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' ei ole sellel platvormil toetatud" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" -msgstr "--checkpoint väärtus ei ole täisarv" +msgstr "--checkpoint väärtus ei ole täisarv" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" -msgstr "Võtmega anti vigane mood" +msgstr "Võtmega anti vigane mood" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "Vigane number" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -"Võti --preserve on mittesoovitatav, kasutage --preserve-permissions --" +"Võti --preserve on mittesoovitatav, kasutage --preserve-permissions --" "preserve-order" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Vigane kirje suurus" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "Kirje suurus peab olema %d kordne." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "Vigane elementide arv" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" -msgstr "Lubatud on ainult üks --to-command võti" +msgstr "Lubatud on ainult üks --to-command võti" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "Vigane tiheduse argument: %s" -#: src/tar.c:2133 -#, fuzzy, c-format +#: src/tar.c:2205 +#, c-format msgid "Unknown density: '%c'" -msgstr "Tundmatu tihedus: `%c'" +msgstr "Tundmatu tihedus: '%c'" -#: src/tar.c:2150 -#, fuzzy, c-format +#: src/tar.c:2222 +#, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" -msgstr "*See* tar ei toeta võtmeid `-[0-7][lmh]'" +msgstr "*See* tar ei toeta võtmeid '-[0-7][lmh]'" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[FAIL]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 #, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "võtit --%s ei saa võtmega %s kasutada" + +#: src/tar.c:2389 +#, c-format msgid "Old option '%c' requires an argument." -msgstr "Vana võti `%c' nõuab argumenti." +msgstr "Vana võti '%c' nõuab argumenti." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" -msgstr "--occurrence ei oma failide nimekirjata mõtet" - -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "--occurrence ei saa valitud tööre¸iimil kasutada" +msgstr "--occurrence ei oma failide nimekirjata mõtet" -#: src/tar.c:2408 -#, fuzzy +#: src/tar.c:2490 msgid "Multiple archive files require '-M' option" -msgstr "Mitme arhiivifaili kasutamine nõuab võtit `-M'" - -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "--listed-incremental ja --newer ei saa koos kasutada" +msgstr "Mitme arhiivifaili kasutamine nõuab võtit '-M'" -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" -msgstr "--level ei oma võtmeta --listed-incremental mõtet" +msgstr "--level ei oma võtmeta --listed-incremental mõtet" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" -msgstr[0] "%s: Volüümi märgend on liiga pikk (piirang on %lu baiti)" -msgstr[1] "%s: Volüümi märgend on liiga pikk (piirang on %lu baiti)" +msgstr[0] "%s: Volüümi märgend on liiga pikk (piirang on %lu baiti)" +msgstr[1] "%s: Volüümi märgend on liiga pikk (piirang on %lu baiti)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" -msgstr "Ei suuda kontrollida mitme volüümilisi arhiive" +msgstr "Ei suuda kontrollida mitme volüümilisi arhiive" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Ei saa kontrollida pakitud arhiive" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "Mustrit %s ei saa kasutada" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" -msgstr "Ei saa kasutada mitme volüümilisi pakitud arhiive" +msgstr "Ei saa kasutada mitme volüümilisi pakitud arhiive" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" -msgstr "Tihendatud arhiive ei saa ühendada" +msgstr "Tihendatud arhiive ei saa ühendada" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option saab kasutada ainult POSIX arhiividega" -#: src/tar.c:2478 -#, fuzzy +#: src/tar.c:2560 msgid "--acls can be used only on POSIX archives" -msgstr "--pax-option saab kasutada ainult POSIX arhiividega" +msgstr "--acls saab kasutada ainult POSIX arhiividega" -#: src/tar.c:2483 -#, fuzzy +#: src/tar.c:2565 msgid "--selinux can be used only on POSIX archives" -msgstr "--pax-option saab kasutada ainult POSIX arhiividega" +msgstr "--selinux saab kasutada ainult POSIX arhiividega" -#: src/tar.c:2488 -#, fuzzy +#: src/tar.c:2570 msgid "--xattrs can be used only on POSIX archives" -msgstr "--pax-option saab kasutada ainult POSIX arhiividega" +msgstr "--xattrs saab kasutada ainult POSIX arhiividega" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "Mustrit %s ei saa kasutada" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" +msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" -msgstr "Volüümi suurus ei saa olla väiksem kirje suurusest" +msgstr "Volüümi suurus ei saa olla väiksem kirje suurusest" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "--preserve-order ei ole ühilduv võtmega --listed-incremental" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" -msgstr "Ega ikka ei tee küll tühja arhiivi" +msgstr "Ega ikka ei tee küll tühja arhiivi" -#: src/tar.c:2565 -#, fuzzy +#: src/tar.c:2669 msgid "Options '-Aru' are incompatible with '-f -'" -msgstr "Võtmeid `-Aru' ei saa kasutada võtmega `-f -'" +msgstr "Võtmeid '-Aru' ei saa kasutada võtmega '-f -'" -#: src/tar.c:2660 -#, fuzzy +#: src/tar.c:2766 msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" -msgstr "Peab kasutama üht võtmetest `-Acdtrux' või `--test-label'" +msgstr "Peab kasutama üht võtmetest '-Acdtrux', '--delete' või '--test-label'" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" -msgstr "Kuna eelnevalt oli vigu, siis lõpetan veakoodiga" +msgstr "Kuna eelnevalt oli vigu, siis lõpetan veakoodiga" + +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" msgid_plural "%s: File shrank by %s bytes" -msgstr[0] "%s: Fail on %s baiti lühem" -msgstr[1] "%s: Fail on %s baiti lühem" +msgstr[0] "%s: Fail on %s baiti lühem" +msgstr[1] "%s: Fail on %s baiti lühem" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" -msgstr "Võtmesõna %s on tundmatu või pole veel realiseeritud" +msgstr "Võtmesõna %s on tundmatu või pole veel realiseeritud" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" -msgstr "Ajatempel on piiridest väljas" +msgstr "Ajatempel on piiridest väljas" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "Mustrit %s ei saa kasutada" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" -msgstr "Võtmesõna %s ei saa ümber määrata" +msgstr "Võtmesõna %s ei saa ümber määrata" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" -msgstr "Vigane laiendatud päis: puudub pikkus" +msgstr "Vigane laiendatud päis: puudub pikkus" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" -msgstr "Laiendatud päise pikkus %*s on piiridest väljas" +msgstr "Laiendatud päise pikkus %*s on piiridest väljas" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" -msgstr "Vigane laiendatud päis: pikkuse järel puudub tühik" +msgstr "Vigane laiendatud päis: pikkuse järel puudub tühik" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" -msgstr "Vigane laiendatud päis: puudub võrdusmärk" +msgstr "Vigane laiendatud päis: puudub võrdusmärk" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" -msgstr "Vigane laiendatud päis: puudub reavahetus" +msgstr "Vigane laiendatud päis: puudub reavahetus" -#: src/xheader.c:740 -#, fuzzy, c-format +#: src/xheader.c:741 +#, c-format msgid "Ignoring unknown extended header keyword '%s'" -msgstr "Ignoreerin tundmatud laiendatud päise võtmesõna `%s'" +msgstr "Ignoreerin tundmatut laiendatud päise võtmesõna '%s'" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" -msgstr "Genereeritud võti/väärtus paar on liiga pikk (võti=%s, pikkus=%s)" +msgstr "Genereeritud võti/väärtus paar on liiga pikk (võti=%s, pikkus=%s)" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" -msgstr "Laiendatud päis %s=%s on piiridest %s..%s väljas" +msgstr "Laiendatud päis %s=%s on piiridest %s..%s väljas" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" -msgstr "Vigane laiendatud päis: %s=%s" +msgstr "Vigane laiendatud päis: %s=%s" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" -msgstr "Vigane laiendatud päis: liigne %s=%s" +msgstr "Vigane laiendatud päis: liigne %s=%s" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" -msgstr "Vigane laiendatud päis: vigane %s: ootamatu eraldaja %c" +msgstr "Vigane laiendatud päis: vigane %s: ootamatu eraldaja %c" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" -msgstr "Vigane laiendatud päis: vigane %s: veider arv väärtuseid" +msgstr "Vigane laiendatud päis: vigane %s: veider arv väärtuseid" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "%s: ei ole korrektne taimout" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "%s: tundmatu kontrollpunkti tegevus" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "kirjutamine" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "lugemine" @@ -2575,7 +2587,7 @@ msgstr "lugemine" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "Kirjutamise kontrollpunkt %u" @@ -2584,7 +2596,7 @@ msgstr "Kirjutamise kontrollpunkt %u" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "Lugemise kontrollpunkt %u" @@ -2595,11 +2607,11 @@ msgid "" "OPTIONS are:\n" msgstr "" "genfile manipuleerib GNU paxutils testipaketi andmefailidega.\n" -"VÕTMED on:\n" +"VÕTMED on:\n" #: tests/genfile.c:127 msgid "File creation options:" -msgstr "Faili loomise võtmed:" +msgstr "Faili loomise võtmed:" #: tests/genfile.c:128 tests/genfile.c:139 msgid "SIZE" @@ -2607,11 +2619,11 @@ msgstr "SUURUS" #: tests/genfile.c:129 msgid "Create file of the given SIZE" -msgstr "Loo määratud suurusega fail" +msgstr "Loo määratud suurusega fail" #: tests/genfile.c:131 msgid "Write to file NAME, instead of standard output" -msgstr "Kirjuta standardväljundi asemel faili NIMI" +msgstr "Kirjuta standardväljundi asemel faili NIMI" #: tests/genfile.c:133 msgid "Read file names from FILE" @@ -2619,11 +2631,11 @@ msgstr "Loe failide nimed failist FAIL" #: tests/genfile.c:135 msgid "-T reads null-terminated names" -msgstr "-T loeb nullidega lõpetatud nimesid" +msgstr "-T loeb nullidega lõpetatud nimesid" #: tests/genfile.c:137 msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'" -msgstr "Täida fail antud mustriga. Muster on 'default' või 'zeros'" +msgstr "Täida fail antud mustriga. Muster on 'default' või 'zeros'" #: tests/genfile.c:140 msgid "Size of a block for sparse file" @@ -2631,7 +2643,7 @@ msgstr "Bloki suurus aukudega faili korral" #: tests/genfile.c:142 msgid "Generate sparse file. Rest of the command line gives the file map." -msgstr "Loo aukudega fail. Järgnev käsurida kirjeldab faili." +msgstr "Loo aukudega fail. Järgnev käsurida kirjeldab faili." #: tests/genfile.c:144 msgid "OFFSET" @@ -2647,54 +2659,54 @@ msgstr "Statistika faili kohta:" #: tests/genfile.c:154 msgid "Print contents of struct stat for each given file. Default FORMAT is: " -msgstr "Väljasta iga faili kohta stat struktuuri sisu. Vaikimisi VORMING on: " +msgstr "Väljasta iga faili kohta stat struktuuri sisu. Vaikimisi VORMING on: " #: tests/genfile.c:161 msgid "Synchronous execution options:" -msgstr "Sünkroonse täitmise võtmed:" +msgstr "Sünkroonse täitmise võtmed:" #: tests/genfile.c:163 msgid "OPTION" -msgstr "VÕTI" +msgstr "VÕTI" #: tests/genfile.c:164 msgid "" "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, " "--unlink" msgstr "" -"Täida antud KÄSKLUS. Kasulik võtmetega --checkpoint ja --cut, --append, --" +"Täida antud KÄSKLUS. Kasulik võtmetega --checkpoint ja --cut, --append, --" "touch, --unlink" #: tests/genfile.c:167 msgid "Perform given action (see below) upon reaching checkpoint NUMBER" -msgstr "Jõudes kontrollpunkti NUMBER, täida antud tegevus (vt. allpool)" +msgstr "Jõudes kontrollpunkti NUMBER, täida antud tegevus (vt. allpool)" #: tests/genfile.c:170 msgid "Set date for next --touch option" -msgstr "Määra järgmise --touch võtme ajatempel" +msgstr "Määra järgmise --touch võtme ajatempel" #: tests/genfile.c:173 msgid "Display executed checkpoints and exit status of COMMAND" -msgstr "Esita täidetud kontrollpunktid ja käsu lõpetamise olek" +msgstr "Esita täidetud kontrollpunktid ja käsu lõpetamise olek" #: tests/genfile.c:178 msgid "" "Synchronous execution actions. These are executed when checkpoint number " "given by --checkpoint option is reached." msgstr "" -"Sünkroonse täitmise tegevused. Neid täidetakse, kui saabub --checkpoint " -"võtmega määratud kontrollpunkt." +"Sünkroonse täitmise tegevused. Neid täidetakse, kui saabub --checkpoint " +"võtmega määratud kontrollpunkt." #: tests/genfile.c:181 msgid "" "Truncate FILE to the size specified by previous --length option (or 0, if it " "is not given)" msgstr "" -"Sea faili suuruseks --length võtmega näidatu (või 0, kui suurust ei antud)" +"Sea faili suuruseks --length võtmega näidatu (või 0, kui suurust ei antud)" #: tests/genfile.c:185 msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option." -msgstr "Lisa faili lõppu --length parameetriga näidatud arv baite." +msgstr "Lisa faili lõppu --length parameetriga näidatud arv baite." #: tests/genfile.c:188 msgid "Update the access and modification times of FILE" @@ -2702,7 +2714,7 @@ msgstr "Uuenda faili kasutamise ja muutmise ajatempleid" #: tests/genfile.c:191 msgid "Execute COMMAND" -msgstr "Käivita KÄSK" +msgstr "Käivita KÄSK" #: tests/genfile.c:194 msgid "Unlink FILE" @@ -2716,7 +2728,7 @@ msgstr "Vigane suurus: %s" #: tests/genfile.c:249 #, c-format msgid "Number out of allowed range: %s" -msgstr "Number on piiridest väljas: %s" +msgstr "Number on piiridest väljas: %s" #: tests/genfile.c:252 #, c-format @@ -2726,12 +2738,12 @@ msgstr "Negatiivne suurus: %s" #: tests/genfile.c:265 tests/genfile.c:569 #, c-format msgid "stat(%s) failed" -msgstr "stat(%s) ebaõnnestus" +msgstr "stat(%s) ebaõnnestus" #: tests/genfile.c:268 #, c-format msgid "requested file length %lu, actual %lu" -msgstr "küsitud faili pikkus %lu, tegelik %lu" +msgstr "küsitud faili pikkus %lu, tegelik %lu" #: tests/genfile.c:272 #, c-format @@ -2746,7 +2758,7 @@ msgstr "Viga `%s' juures numbri parsimisel" #: tests/genfile.c:367 #, c-format msgid "Unknown date format" -msgstr "Tundmatu kuupäeva vorming" +msgstr "Tundmatu kuupäeva vorming" #: tests/genfile.c:391 msgid "[ARGS...]" @@ -2760,42 +2772,42 @@ msgstr "`%s' ei saa avada" #: tests/genfile.c:434 msgid "cannot seek" -msgstr "seek ebaõnnestus" +msgstr "seek ebaõnnestus" #: tests/genfile.c:451 #, c-format msgid "file name contains null character" -msgstr "faili nimi sisaldab null sümbolit" +msgstr "faili nimi sisaldab null sümbolit" #: tests/genfile.c:518 #, c-format msgid "cannot generate sparse files on standard output, use --file option" -msgstr "standard väljundis ei saa aukudega faili luua, kasutage võtit --file" +msgstr "standard väljundis ei saa aukudega faili luua, kasutage võtit --file" #: tests/genfile.c:596 #, c-format msgid "incorrect mask (near `%s')" -msgstr "vigane mask (`%s' lähedal)" +msgstr "vigane mask (`%s' lähedal)" #: tests/genfile.c:602 tests/genfile.c:635 #, c-format msgid "Unknown field `%s'" -msgstr "Tundmatu väli `%s'" +msgstr "Tundmatu väli `%s'" #: tests/genfile.c:662 #, c-format msgid "cannot set time on `%s'" -msgstr "ei õnnestu seada `%s' aega" +msgstr "ei õnnestu seada `%s' aega" #: tests/genfile.c:692 -#, fuzzy, c-format +#, c-format msgid "cannot truncate `%s'" -msgstr "`%s' ei saa kustutada" +msgstr "'%s' ei saa lühendada" #: tests/genfile.c:701 -#, fuzzy, c-format +#, c-format msgid "command failed: %s" -msgstr "%s käsklus sai vea" +msgstr "käsklus sai vea: %s" #: tests/genfile.c:706 #, c-format @@ -2805,55 +2817,46 @@ msgstr "`%s' ei saa kustutada" #: tests/genfile.c:833 #, c-format msgid "Command exited successfully\n" -msgstr "Käsk lõpetas töö edukalt\n" +msgstr "Käsk lõpetas töö edukalt\n" #: tests/genfile.c:835 #, c-format msgid "Command failed with status %d\n" -msgstr "Käsk lõpetas veakoodiga %d\n" +msgstr "Käsk lõpetas veakoodiga %d\n" #: tests/genfile.c:839 #, c-format msgid "Command terminated on signal %d\n" -msgstr "Käsk katkestati signaaliga %d\n" +msgstr "Käsk katkestati signaaliga %d\n" #: tests/genfile.c:841 #, c-format msgid "Command stopped on signal %d\n" -msgstr "Käsk peatati signaaliga %d\n" +msgstr "Käsk peatati signaaliga %d\n" #: tests/genfile.c:844 #, c-format msgid "Command dumped core\n" -msgstr "Käsk salvestas mälupildi\n" +msgstr "Käsk salvestas mälupildi\n" #: tests/genfile.c:847 #, c-format msgid "Command terminated\n" -msgstr "Käsk katkestas\n" +msgstr "Käsk katkestas\n" #: tests/genfile.c:879 #, c-format msgid "--stat requires file names" -msgstr "--stat nõuab failinimesid" - -#~ msgid "Cannot get working directory" -#~ msgstr "Ei õnnestu lugeda töökataloogi" - -#~ msgid "sort names to extract to match archive" -#~ msgstr "taasta failid arhiveerimis järjekorras" - -#~ msgid "Field too long while reading snapshot file" -#~ msgstr "Snapshoti faili lugemisel leiti liiga pikk väli" +msgstr "--stat nõuab failinimesid" -#~ msgid "Read error in snapshot file" -#~ msgstr "Snapshoti failist lugemise viga" +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "--occurrence ei saa %s korral kasutada" -#~ msgid "Unexpected field value in snapshot file" -#~ msgstr "Snapshoti failis on väljal ootamatu väärtus" +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "--listed-incremental ja --newer ei saa koos kasutada" -#~ msgid "Extended header length is out of allowed range" -#~ msgstr "Laiendatud päise pikkus on piiridest väljas" +#~ msgid "--verify cannot be used with %s" +#~ msgstr "--verify ei saa %s korral kasutada" -#~ msgid "Invalid group" -#~ msgstr "Vigane grupp" +#~ msgid "--preserve-order is not compatible with --listed-incremental" +#~ msgstr "--preserve-order ei ole ühilduv võtmega --listed-incremental" diff --git a/po/eu.gmo b/po/eu.gmo index 343e9ee..7b8e1c0 100644 Binary files a/po/eu.gmo and b/po/eu.gmo differ diff --git a/po/eu.po b/po/eu.po index 12543b7..a7e2e90 100644 --- a/po/eu.po +++ b/po/eu.po @@ -5,12 +5,12 @@ # This file is distributed under the same license as the tar package. # # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" "Project-Id-Version: tar-1.15.91-eu\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" "PO-Revision-Date: 2006-12-13 19:52+0100\n" "Last-Translator: Mikel Olasagasti \n" "Language-Team: Basque \n" @@ -101,7 +101,7 @@ msgstr "laguntza zerrenda hau eman" msgid "give a short usage message" msgstr "erabilera mezu labur bat eman" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "IZENA" @@ -389,9 +389,7 @@ msgstr "Arazoen berri %s-en eman.\n" #: gnu/version-etc.c:249 #, fuzzy, c-format msgid "Report %s bugs to: %s\n" -msgstr "" -"\n" -"Erroreen berri <%s>-ra eman.\n" +msgstr "Arazoen berri %s-en eman.\n" #: gnu/version-etc.c:253 #, c-format @@ -411,7 +409,7 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: Ezin da %s" @@ -420,56 +418,56 @@ msgstr "%s: Ezin da %s" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: Oharra: Ezin da %s" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: Ezin da modua %s-ra aldatu" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: Ezin da jabetza uid %lu, gid %lu -ra aldatu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: Ezin da %s-ra gogorki lotu" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Irakurketa errorea %s byte-an, byte %lu irakurtzerakoan" msgstr[1] "%s: Irakurketa errorea %s byte-an, %lu byte irakurtzerakoan" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Oharra: Irakurketa errorea %s byte-an, byte %lu irakurtzerakoan" msgstr[1] "%s: Oharra: Irakurketa errorea %s byte-an, %lu byte irakurtzerakoan" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: Ezin da %s-ra seek egin" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: Oharra: Ezin da %s-ra seek egin" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: Ezin da %s-ra lotura sinbolkoa sortu" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -575,8 +573,8 @@ msgstr "Fitxategi Amaiera Esperogabea" msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "ZENBAKIA" @@ -584,10 +582,10 @@ msgstr "ZENBAKIA" msgid "set debug level" msgstr "" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "FITXATEGIA" @@ -609,103 +607,111 @@ msgstr "argumentu gehiegi" msgid "Garbage command" msgstr "Zabor komandoa" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Honek ez dirudi tar pakete bat" -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" -msgstr "Idatziriko byte-ak guztira" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" msgstr "Irakurritako byte-ak guztira" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "Idatziriko byte-ak guztira" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Ezabaturiko byte-ak guztira: %s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(tutua)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "balio baliogabea record_size-rentzat" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Ez da fitxategi izenik eman" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Ezin da sarrera/irteera estandar fitxategia egiaztatu" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Fitxategia konprimiturik dago. %s aukera erabili" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Ezin dira konprimituriko fitxategiak eguneratu" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "Zintaren hasieran, uzten" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "Errore gehiegi, uzten" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Grabazio tamaina = bloke %lu" msgstr[1] "Grabazio tamaina = %lu bloke" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "Alineatu gabeko blokea (byte %lu) paketean" msgstr[1] "Alineatu gabeko blokea (%lu byte) paketean" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: bolumen zenbaki baliogabea du" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "Bolumen zenbaki gainezkatzea" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "#%d bolumena %s -rako prestatu eta enter sakatu: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "Fitxategi amaiera erabiltzaile erantzuna espero zenean" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "Oharra: Paketea ez dago osaturik" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -716,72 +722,72 @@ msgstr "" " q tar utzi\n" " y edo intro Ekintza jarraitu\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Azpishell bat sortu\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? Zerrenda hau inprimatu\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Ez dago bolumen berririk; uzten.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "Ez da fitxategi izenik ezarri. Berriz saiatu.\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "SArrera baliogabea. ? idatzi laguntzarako.\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "%s komandoak huts egin du" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s posibleki bolumen honen jarraipena da: buruak mozturiko izena du" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s ez da bolumen honen jarraipena" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s okerreko tamaina da (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Bolumen hau sekuentziatik kanpo dago" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "%s bolumena ez da %s-ren pareko" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" "%s: fitxategi izen luzeegia GNU bolumen anitzeko buruan gordetzeko, mozturik" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "" @@ -792,16 +798,16 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "%lu byte bakarrik irakurri daiteke %lu byte-tatik" msgstr[1] "%lu byte bakarrik irakurri daiteke %lu byte-tatik" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "Eduki ezberdintasunak" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "Esperogabeko Fitxategi amaiaera paketean" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "Fixtategi mota ezberdinak" @@ -821,7 +827,7 @@ msgstr "Gid ezberdinak" msgid "Mod time differs" msgstr "Eraldaketa data ezberdinak" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Tamaina ezberdinak" @@ -838,37 +844,37 @@ msgstr "Lotura sinboliko ezberdinak" msgid "Device number differs" msgstr "Gailu zenbaki ezberdinak" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Egiaztatu " -#: src/compare.c:471 +#: src/compare.c:473 #, fuzzy, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "%s: `%c' fitxategi mota ezezaguna, fitxategi arrunt batez ezberdina" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "" -#: src/compare.c:533 +#: src/compare.c:535 #, fuzzy msgid "Archive contains transformed file names." msgstr "Paketeak zaharkituriko base-64 buruak ditu" -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "Egiaztapenak huts egin dezake jatorrizko fitxategiak kokatzerakoan." -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "EGIAZTAPEN AKATSA: buru baliogabe %d aurkitu da" msgstr[1] "EGIAZTAPEN AKATSA: %d buru baliogabe aurkitu dira" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "" @@ -914,56 +920,56 @@ msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "" msgstr[1] "" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: fitxategia fitxategi sistema ezberdin batetan dago, ez da irauliko" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Fitxategi mota ezezaguna; fitxategia alde batetara utziko da" -#: src/create.c:1549 +#: src/create.c:1551 #, fuzzy, c-format msgid "Missing links to %s." msgstr "%s-ra lotura falta da.\n" -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: fitxategia ez da aldatu, ez da irauliko" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: fitxategia paketea da, ez da irauliko" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 #, fuzzy msgid "directory not dumped" msgstr "%s: katxe direktorioa marka bat du; ez da irauliko" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: fitxategia aldatu egin da irakurtzen ari zenean" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: socket-a alde batetara utzi da" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: atea alde batetara utzia" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Hurrengoa burura salto egiten" @@ -1009,7 +1015,7 @@ msgstr "Lotura sinbolikoak lotura gogor bezala ateratzen saiatzen" msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Ezin da atera -- paketea beste bolumen baten jarraipena da" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" msgstr "Buru izen luzera esperogabea" @@ -1054,159 +1060,159 @@ msgstr "%s: fitxategia fitxategi sistema ezberdin batetan dago, ez da irauliko" msgid "%s: Directory has been renamed" msgstr "%s: Direktorioa berrizendatua izan da" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "denbora marka baliogabea" -#: src/incremen.c:1045 +#: src/incremen.c:1047 #, fuzzy msgid "Invalid modification time" msgstr "Eraldaketa denbora (segundu) baliogabea" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "Eraldaketa denbora (nanosegundu) baliogabea" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "gailu zenbaki baliogabea" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Inodo zenbaki baliogabea" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" msgstr "" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Eremu balio esperogabea snapshot fitxategian" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" msgstr "" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" msgstr "" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "Gordetze amaiera falta da" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "Fitxategi inkremental formatu okerra" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, fuzzy, c-format msgid "Unsupported incremental format version: %" msgstr "Onartugabeko inkremental formatu bertsioa: %d" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" "Gaizki eratutako iraulketa direktorioa: '%c'espero zen baina %#3o aurkitu da" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Gaizki eratutako iraulketa direktorioa: 'X' bikoizturik" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Gaizki eratutako iraulketa direktorioa: izen hutsa 'R'-en" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Gaizki eratutako iraulketa direktorioa: 'T' ez doa 'R' atzean" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Gaizki eratutako iraulketa direktorioa: izen hutsa 'T'-en" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" "Gaizki eratutako iraulketa direktorioa: '%c' espero zen baina data amaiera " "aurkitu da" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "Gaizki eratutako iraulketa direktorioa: 'X' ez da inoiz erabili" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Ezin da aldiroko direktorioa sortu %s txantiloia erabiliaz" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Ez da direktorioa garbituko: ezin da egoera eskuratu" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: direktorioa gailu ezberdin batetan dago: ez da garbituko" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s ezabatzen\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: Ezin da ezabatu" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: Alde batetara uzten" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "%s blokea: ** Fitxategi Amaiera **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "%s blokea: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Zuriunea buruan zenbakizko %s balioa espero zenean" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1214,96 +1220,96 @@ msgstr "" "direla pentsatuko da" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Paketearen zortzitar %.*s balioa %s eremutik kanpo dago" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "Paketeak zaharkituriko base-64 buruak ditu" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Paketeak %.*s du zenbakizko %s balioa espero zenean " #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Pakete %s balioa %s eremutik kanpo dago %s.. %s" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " %s-ra lotu\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " %s fitxategi mota ezezaguna\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--Lotura Luzea--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--Izen Luzea--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Bolumen Burua--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--%s byte-an jarraitzen du--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Direktorioa sortzen:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "%s %s-ra berrizendatzen\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Ezin da %s-ra berrizendatu" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "%s %s-ra atzera berrizendatzen\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Fitxategia irakurri baino lehen ezabaturik" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "ume prozesua" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "prozesu arteko kanala" @@ -1317,7 +1323,7 @@ msgstr "%s komandoak huts egin du" msgid "%s: file list requested from %s already read from %s" msgstr "%s: fitxategi zerrenda irakurria dagoeneko" -#: src/names.c:448 +#: src/names.c:448 src/checkpoint.c:274 #, fuzzy, c-format msgid "cannot split string '%s': %s" msgstr "ezin da `%s'-ren denbora ezarri" @@ -1327,55 +1333,55 @@ msgstr "ezin da `%s'-ren denbora ezarri" msgid "%s: file name read contains nul character" msgstr "" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: Ez da paketean aurkitu" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "" -#: src/names.c:876 +#: src/names.c:879 #, c-format msgid "Archive label mismatch" msgstr "" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "`-%s' eta `-%s' aukerek sarrera estandarra behar dute" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s: Pakete formatu baliogabea" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "GNU ezaugarriak behar dira pakete formatu bateraezinean" -#: src/tar.c:255 +#: src/tar.c:264 #, fuzzy, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." @@ -1383,7 +1389,7 @@ msgstr "" "`%s' markatze estilo ezezaguna. Saiatu `%s --quoting-style=help' zerrenda " "eskuratzeko." -#: src/tar.c:364 +#: src/tar.c:378 #, fuzzy msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " @@ -1414,7 +1420,7 @@ msgstr "" "erabili\n" " never, simple beti babeskopia sinpleak egin\n" -#: src/tar.c:373 +#: src/tar.c:387 #, fuzzy msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1446,80 +1452,80 @@ msgstr "" "erabili\n" " never, simple beti babeskopia sinpleak egin\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "Ekintza nagusi modua:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "pakete baten edukiak zerrendatu" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "pakete batetako fitxategiak atera" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "pakete berri bat sortu" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "paketea eta fitxategi sistema arteko ezberdintasunak bilatu" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "fitxategiak paketearen amaieran gehitu" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "" "paketean dauden kopiak baino berriagoak diren fitxategiak bakarrik gehitu" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "gehitu tar fitxategiak pakete batetara" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "paketetik ezabatu (ez mag zintetan!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "pakete bolumen etiketa egiaztatu eta irten" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "Ekintza aldagaiak:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "sakabanatutako fitxategiak egoki kudeatu" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "GNU basbeskopia inkremenetal formatu zaharra kudeatu" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "GNU basbeskopia inkremenetal formatu berria kudeatu" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1527,167 +1533,175 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "paketeak `seek' onartzen du" -#: src/tar.c:453 +#: src/tar.c:467 #, fuzzy msgid "archive is not seekable" msgstr "paketeak `seek' onartzen du" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:464 +#: src/tar.c:478 #, fuzzy msgid "Overwrite control:" msgstr "Gainidazketa kontrola:\n" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "fitxategia egiaztatzen saiatu idatzi aurretik" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "ezabatu fitxategiak paketera gehitu aurretik" -#: src/tar.c:471 +#: src/tar.c:485 #, fuzzy msgid "don't replace existing files when extracting, treat them as errors" msgstr "ez ordezkatu dauden fitxategiak ateratzerakoan" -#: src/tar.c:474 +#: src/tar.c:488 #, fuzzy msgid "don't replace existing files when extracting, silently skip over them" msgstr "ez ordezkatu dauden fitxategiak ateratzerakoan" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "" "ez ordezkatu ateratzerakoan dauden fitxategiak paketeko kopiak baino " "berriagoak badira" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "gainidatzi dauden fitxategiak ateratzerakoan" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "dauden direktorioen metadata mantendu" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "dauden direktorioen metadata gainidatzi ateratzerakoan (lehenetsia)" -#: src/tar.c:490 +#: src/tar.c:504 #, fuzzy msgid "preserve existing symlinks to directories when extracting" msgstr "gainidatzi dauden fitxategiak ateratzerakoan" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "DIR" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "Irteera korrontea hautatu:" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "fitxategiak irteera estandarrera atera" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "KOMANDOA" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "bideratu ateratako fitxategiak beste programa batetara" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "alde batetara utzi semeen irteera kodeak" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "zero ez diren semeen irteera kodeekin errore bat bezala jokatu" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Fitxategi atributu kudeaketa:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "indartu IZENA jabe bezala gehituriko fitxategientzat" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "indartu IZENA talde bezala gehituriko fitxategientzat" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "DATA-EDO-FITXATEGIA" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "ALDAKETAK" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "indartu (sinbolikoa) modu ALDAKETAK gehituriko lerroentzat" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "METODOA" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " "place (METHOD='system')" msgstr "" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "ez atera fitxategi eraldaketa data" -#: src/tar.c:528 +#: src/tar.c:545 #, fuzzy msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" msgstr "jabe berdinaren fitxategiak ateratzen saiatu" -#: src/tar.c:530 +#: src/tar.c:547 #, fuzzy msgid "extract files as yourself (default for ordinary users)" msgstr "atera fitxategiak zure kabuz" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "beti erabili zenbakiak erabiltzaile/talde izenen ordez" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" "fitxategi baimenei buruzko argibideak atera (lehenetsia root " "erabiltzailearentzat)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1695,474 +1709,492 @@ msgstr "" "erabiltzailearen umask-a erabili paketetik baimenak ateratzerakoan " "(lehenetsia erabiltzaile arruntentzat)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "-p eta -s bikotearen berdina" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "--delay-directory-restore aukeraren eragina ezeztatu" -#: src/tar.c:554 +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 #, fuzzy msgid "Handling of extended file attributes:" msgstr "Fitxategi atributu kudeaketa:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" msgstr "" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" msgstr "" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" msgstr "" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" msgstr "" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" msgstr "" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" msgstr "" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" msgstr "" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" msgstr "" -#: src/tar.c:576 +#: src/tar.c:600 #, fuzzy msgid "Device selection and switching:" msgstr "Gailu hautapen eta aldaketa:\n" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "PAKETEA" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "pakete fitxategia edo gailu PAKETEA erabili" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "pakete fitxategi lokala da nahiz bi puntu izan" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "Emandako rmt KOMANDOA erabili rmt ordez" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "Urruneko KOMANDOA erabili rsh ordez" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "Gailu eta dentsitatea ezarri" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "sortu/zerrendatu/atera bolumen-anitzeko paketea" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "zinta aldatu ZENBAKIA x 1024 byte idatzi ondoren" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "scipt-a abiarazi zinta bakoitzaren amaieran (-M behar du)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "erabili/eguneratu FITXATEGI bolumen zenbakia" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "Gailu blokeak:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "BLOKE" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "BLOKE x 512 byte grabazio bakoitzeko" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "grabazio bakoitzeko byte ZENBAKIA, 512-ren multiploa" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "paketean zeroz betetako blokeak alde batetara utzi" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "irakurri ahala berriz bloke egin (4.2BSD tutuentzat)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "Pakete formatu hautapena:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "FORMATUA" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "emandako formatuko pakete bat sortu" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "FORMATUA hauetako bat da:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "V7 tar formatu zaharra" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "GNU formatua tar <= 1.12" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x formatua" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) formatua" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) formatua" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "pax-en berdina" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "--format=v7-ren berdina" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "--format=posix-ren berdina" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "gakoa[[:]=balioavalue][,gakoa[[:]=balioa]]..." -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "TESTUA" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:660 +#: src/tar.c:684 #, fuzzy msgid "Compression options:" msgstr "Elkarjotzen duten konpresio aukerak" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "PROG" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "PROG bidez iragazi (-d onartu behar du)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "Fixtategi lokal hautapena:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" "Emandako FITXATEGIA paketera gehitu /Erabilgarri izena asaterisko batez " "asten bada)" -#: src/tar.c:687 -msgid "DIR" -msgstr "DIR" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "DIR direktoriora aldatu" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "ateratzeko edo sortzeko izenak FITXATEGIA-tik eskuratu" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +msgid "unquote input file or member names (default)" msgstr "" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +msgid "do not unquote input file or member names" msgstr "" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "PATROIA" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "fixtategiak utzi, PATROIA bezala emandakoak" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "FITXATEGIAN zerrendaturiko patroiak alde batetara utzi" -#: src/tar.c:704 +#: src/tar.c:728 #, fuzzy msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "katxe marka duten direktorioak alde batetara utzi" -#: src/tar.c:707 +#: src/tar.c:731 #, fuzzy msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "katxe marka duten direktorioak alde batetara utzi" -#: src/tar.c:710 +#: src/tar.c:734 #, fuzzy msgid "exclude directories containing CACHEDIR.TAG" msgstr "katxe marka duten direktorioak alde batetara utzi" -#: src/tar.c:712 +#: src/tar.c:736 #, fuzzy msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "katxe marka duten direktorioak alde batetara utzi" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 #, fuzzy msgid "exclude everything under directories containing FILE" msgstr "katxe marka duten direktorioak alde batetara utzi" -#: src/tar.c:717 +#: src/tar.c:747 #, fuzzy msgid "exclude directories containing FILE" msgstr "katxe marka duten direktorioak alde batetara utzi" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "sahiestu automatikoki direktorioetan zehar jeistea" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "fitxategi sistema lokalean egon paketea sortzerakoan" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "direktorioetan barrena (lehenetsia)" -#: src/tar.c:729 +#: src/tar.c:761 #, fuzzy msgid "don't strip leading '/'s from file names" msgstr "Ez kendu hasierako `/' fitxategi izenetatik" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "" "lotura sinbolikoak jarraitu; lotzen dituzten fitxategiak irauli eta paketean " "sartu" -#: src/tar.c:733 +#: src/tar.c:765 #, fuzzy msgid "follow hard links; archive and dump the files they refer to" msgstr "" "lotura sinbolikoak jarraitu; lotzen dituzten fitxategiak irauli eta paketean " "sartu" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "PARTAIDE IZEN" -#: src/tar.c:735 +#: src/tar.c:767 msgid "begin at member MEMBER-NAME when reading the archive" msgstr "" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "DATA" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "data eta ordua parekatu data bakarrik aldatzen denean" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "KONTROL" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "babeskopia egin ezabatu aurretik, KONTROL bertsioa hautatu" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "KATEA" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "Fitxategi izen eraldaketak:" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "ESPRESIOA" -#: src/tar.c:754 +#: src/tar.c:786 #, fuzzy msgid "use sed replace EXPRESSION to transform file names" msgstr "Sed-en ordezko EXPRESIOA erabili fitxategi izenak eraldatzeko" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "kasua alde batetara utzi" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "" -#: src/tar.c:767 +#: src/tar.c:799 msgid "patterns match after any '/' (default for exclusion)" msgstr "" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "verbatim kate parekatzea" -#: src/tar.c:775 +#: src/tar.c:807 #, fuzzy msgid "wildcards do not match '/'" msgstr "%s bolumena ez da %s-ren pareko" -#: src/tar.c:777 +#: src/tar.c:809 msgid "wildcards match '/' (default for exclusion)" msgstr "" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "irteera informatiboa:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "" -#: src/tar.c:787 +#: src/tar.c:819 #, fuzzy msgid "warning control" msgstr "Gainidazketa kontrola:\n" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" "Aurrerapen mezuak bistarazi grabaketa ZENBAKI bakiotzagatik (lehenetsia 10 " "da)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "mezu bat inprimatu lotura guztiak ez badira iraultzen" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "SEINALEA" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2170,317 +2202,311 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:802 +#: src/tar.c:834 #, fuzzy msgid "print file modification times in UTC" msgstr "eraldaketa datak UTC orduan bistarazi" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "irteera luzea FITXATEGIRA bidali" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "Bloke zenbakia bistarazu pakete bakoitzeko mezu bakoitzagatik" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "berrespena eskatu ekintza bakoitzean" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "tar lehenespenak bistarazi" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "fixtategi edo pakete izenak bistarazi eraldaketaren aurretik" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "ESTILOA" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "Gako karaktere gehigarriak KATE-tik" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "gakoak kendu karaktereentzat KATE-tik" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "Bateragarritasun aukerak:" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "Beste aukerak:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "ezgaitu arriskutsu izan daitezken zenbait aukera" -#: src/tar.c:978 +#: src/tar.c:1010 #, fuzzy msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" msgstr "Ezin duzu `-Acdtrux' aukera bat baino gehiago ezarri" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Elkarjotzen duten konpresio aukerak" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "Seinale izen ezezaguna: %s" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "Data adibide fitxategia ez da aurkitu" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "%s %s data formatu ezezagunagatik aldatzen" -#: src/tar.c:1108 +#: src/tar.c:1140 #, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, fuzzy, c-format msgid "filter the archive through %s" msgstr "fitxategia gzip bidez iragazi" -#: src/tar.c:1179 +#: src/tar.c:1214 #, fuzzy msgid "Valid arguments for the --quoting-style option are:" msgstr "--quoting-style-entzat balio erabilgarriak:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1295 +#: src/tar.c:1330 #, fuzzy msgid "Invalid owner or group ID" msgstr "Jabe baliogabea" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Blokeo faktore baliogabea" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "Zinta luzera baliogabea" -#: src/tar.c:1466 +#: src/tar.c:1521 #, fuzzy msgid "Invalid incremental level value" msgstr "Fitxategi inkremental formatu okerra" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "Atari data bat baino gehiago" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' ez da onartzen plataforma honetan" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "--checkpoint balioa ez da zenbaki oso bat" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Modu baliogabea eman da aukeran" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "Zenbaki baliogabea" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Grabazio tamaina baliogabea" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "Grabaszio tamaina %d-ren multiplo bat izan behar da." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "Elementu kopuru baliogabea" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "--to-command aukera bat bakarrik onartzen da" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "Gaizki eratutako dentsitate argumentua: %s" -#: src/tar.c:2133 +#: src/tar.c:2205 #, fuzzy, c-format msgid "Unknown density: '%c'" msgstr "Dentsitate Ezezaguna: `%c'" -#: src/tar.c:2150 +#: src/tar.c:2222 #, fuzzy, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr " `-[0-7][lmh]' aukerak ez dira onartzen tar *honetan*" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[FITXATEGIA]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 +#, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "%s patroia ezin da erabili" + +#: src/tar.c:2389 #, fuzzy, c-format msgid "Old option '%c' requires an argument." msgstr "`%c' zaharkituriko aukerak argumentu bat behar du" -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2389 -#, c-format -msgid "--occurrence cannot be used with %s" -msgstr "" - -#: src/tar.c:2408 +#: src/tar.c:2490 #, fuzzy msgid "Multiple archive files require '-M' option" msgstr "Pakete fitxategi anitzentzat `-M' aukera erabili behar da" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "Ezin dira --listed-incremental eta --newer batera erabili" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "%s: Bolumen etiketa luzeegia da (muga %lu byte da)" msgstr[1] "%s: Bolumen etiketa luzeegia da (muga %lu byte da)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Ezin dira bolumen-anitzeko paketeak egiaztatu" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Ezin dira konprimituriko fitxategiak egiaztatu" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "%s patroia ezin da erabili" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Ezin dira bolumen anitzeko konprimituriko paketeak erabaili" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "Ezin dira konprimituriko paketeak kateatu" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option POSIX paketeekin bakarrik erabili daiteke" -#: src/tar.c:2478 +#: src/tar.c:2560 #, fuzzy msgid "--acls can be used only on POSIX archives" msgstr "--pax-option POSIX paketeekin bakarrik erabili daiteke" -#: src/tar.c:2483 +#: src/tar.c:2565 #, fuzzy msgid "--selinux can be used only on POSIX archives" msgstr "--pax-option POSIX paketeekin bakarrik erabili daiteke" -#: src/tar.c:2488 +#: src/tar.c:2570 #, fuzzy msgid "--xattrs can be used only on POSIX archives" msgstr "--pax-option POSIX paketeekin bakarrik erabili daiteke" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "%s patroia ezin da erabili" - -#: src/tar.c:2525 -msgid "Volume length cannot be less than record size" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" msgstr "" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" +#: src/tar.c:2630 +msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "" -#: src/tar.c:2565 +#: src/tar.c:2669 #, fuzzy msgid "Options '-Aru' are incompatible with '-f -'" msgstr " `-Aru' aukerak bateraezinak dira `-f -' rekin" -#: src/tar.c:2660 +#: src/tar.c:2766 #, fuzzy msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" msgstr "Behintzat `-Acdtrux' aukeretako bat ezarri behar duzu" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" @@ -2488,100 +2514,100 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "" msgstr[1] "" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "%s gakoa ezezaguna da edo ez dago inplementaturik oraindik" -#: src/xheader.c:173 +#: src/xheader.c:174 #, fuzzy msgid "Time stamp is out of allowed range" msgstr "Denbora marka eremuz kanpo dago" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "%s patroia ezin da erabili" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "%s gakoa ezin da gainidatzi" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "Gaizki eratutako buru luzapena: luzera falta da" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr " %*s buru luzapen luzera eremuz kanpo dago" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "Gaizki eratutako buru luzapena: luzera ondoren hutsunea falta da" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "Gaizki eratutako buru luzapena: berdin ikurra falta da" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "Gaizki eratutako buru luzapena: lerro berria falta da" -#: src/xheader.c:740 +#: src/xheader.c:741 #, fuzzy, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "alde batetara utzi gako buru luzapen ezezaguna `%s'" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "buru luzapena %s=%s eremuz kanpo dago %s..%s" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Gaizki eratutako buru luzapena: baliogabea %s=%s" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Gaizki eratutako buru luzapena: gehiegizkoa %s=%s" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" "Gaizki eratutako buru luzapena: %s baliogabea: %c mugatzaile esperodageba" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "Gaizki eratutako buru luzapena: %s baliogabea: balio kopuru bitxia" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, fuzzy, c-format msgid "%s: not a valid timeout" msgstr "%s: Talde baliogabea" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "" @@ -2589,7 +2615,7 @@ msgstr "" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "Idazketa %u egiaztapen puntua" @@ -2598,7 +2624,7 @@ msgstr "Idazketa %u egiaztapen puntua" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "Irakurketa %u egiaztapen puntua" @@ -2855,72 +2881,19 @@ msgstr "Komandoa amaitua\n" msgid "--stat requires file names" msgstr "--stat -ek fitxategi izenak behar ditu" -#, fuzzy -#~ msgid "Cannot get working directory" -#~ msgstr "Ezin da lan direktorioa aldatu" - -#~ msgid "Field too long while reading snapshot file" -#~ msgstr "Eremu luzeegia snapshot fitxategia irakurtzerakoan" - -#, fuzzy -#~ msgid "Read error in snapshot file" -#~ msgstr "Eremu balio esperogabea snapshot fitxategian" - -#~ msgid "Unexpected field value in snapshot file" -#~ msgstr "Eremu balio esperogabea snapshot fitxategian" - -#, fuzzy -#~ msgid "Extended header length is out of allowed range" -#~ msgstr " %*s buru luzapen luzera eremuz kanpo dago" - -#, fuzzy -#~ msgid "Invalid group" -#~ msgstr "%s: Talde baliogabea" - -#, fuzzy -#~ msgid "%s: Directory removed before we read it" -#~ msgstr "%s: Fitxategia irakurri baino lehen ezabaturik" - -#, fuzzy -#~ msgid "Cannot restore working directory" -#~ msgstr "Ezin da lan direktorioa gorde" - -#, fuzzy -#~ msgid "Cannot resolve hostname %s" -#~ msgstr "Ezin da %s %s-ra berrizendatu" - -#~ msgid "suppress this warning." -#~ msgstr "ohar hau kendu." +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "Ezin dira --listed-incremental eta --newer batera erabili" #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: -- %c legezkanpoko aukera\n" -#~ msgid "Reading %s\n" -#~ msgstr "%s irakurtzen\n" - -#~ msgid "" -#~ "\n" -#~ "Report bugs to <%s>.\n" -#~ msgstr "" -#~ "\n" -#~ "Erroreen berri <%s>-ra eman.\n" - -#~ msgid "filter the archive through bzip2" -#~ msgstr "fitxategia bzip2 bidez iragazi" - -#~ msgid "filter the archive through gzip" -#~ msgstr "fitxategia gzip bidez iragazi" - -#~ msgid "filter the archive through compress" -#~ msgstr "fitxategia konpresorearen bidez iragazi" - -#, fuzzy -#~ msgid "filter the archive through lzma" -#~ msgstr "fitxategia gzip bidez iragazi" +#~ msgid "block size" +#~ msgstr "bloke tamaina" -#, fuzzy -#~ msgid "filter the archive through lzop" -#~ msgstr "fitxategia gzip bidez iragazi" +#~ msgid "%s: Read error at byte %s, reading %lu byte" +#~ msgid_plural "%s: Read error at byte %s, reading %lu bytes" +#~ msgstr[0] "%s: Irakurketa errorea %s byte-an, byte %lu irakurtzerakoan" +#~ msgstr[1] "%s: Irakurketa errorea %s byte-an, %lu byte irakurtzerakoan" #~ msgid "Input string too long" #~ msgstr "Sarrera kate luzeegia" @@ -2950,23 +2923,25 @@ msgstr "--stat -ek fitxategi izenak behar ditu" #~ " --version Bertsio argibideak eman.\n" #~ " --help Laguntza hau eman.\n" +#~ msgid "" +#~ "\n" +#~ "Report bugs to <%s>.\n" +#~ msgstr "" +#~ "\n" +#~ "Erroreen berri <%s>-ra eman.\n" + #~ msgid "Seek offset error" #~ msgstr "Seek offset errorea" #~ msgid "Premature end of file" #~ msgstr "Fitxategi amaiera azkarregia" +#~ msgid "Reading %s\n" +#~ msgstr "%s irakurtzen\n" + #~ msgid "Error is not recoverable: exiting now" #~ msgstr "Errorea berreskura ezina da: irteten" -#~ msgid "block size" -#~ msgstr "bloke tamaina" - -#~ msgid "%s: Read error at byte %s, reading %lu byte" -#~ msgid_plural "%s: Read error at byte %s, reading %lu bytes" -#~ msgstr[0] "%s: Irakurketa errorea %s byte-an, byte %lu irakurtzerakoan" -#~ msgstr[1] "%s: Irakurketa errorea %s byte-an, %lu byte irakurtzerakoan" - #~ msgid "Modification time (seconds) out of range" #~ msgstr "Eraldaketa denbora (segundu) eremuz kanpo dago" @@ -2976,6 +2951,9 @@ msgstr "--stat -ek fitxategi izenak behar ditu" #~ msgid "Device number out of range" #~ msgstr "Gailu zenbakia eremuz kanpo dago" +#~ msgid "Field too long while reading snapshot file" +#~ msgstr "Eremu luzeegia snapshot fitxategia irakurtzerakoan" + #~ msgid "Error reading time stamp" #~ msgstr "Errorea denbora marka irakurtzerakoan" @@ -2994,6 +2972,15 @@ msgstr "--stat -ek fitxategi izenak behar ditu" #~ msgid "Symlinked %s to %s" #~ msgstr "%s %s-ra sibolikoki lotua" +#~ msgid "suppress this warning." +#~ msgstr "ohar hau kendu." + +#~ msgid "filter the archive through bzip2" +#~ msgstr "fitxategia bzip2 bidez iragazi" + +#~ msgid "filter the archive through compress" +#~ msgstr "fitxategia konpresorearen bidez iragazi" + #~ msgid "same as -N" #~ msgstr "-N -ren berdina" diff --git a/po/fi.gmo b/po/fi.gmo index 2154b14..502b23e 100644 Binary files a/po/fi.gmo and b/po/fi.gmo differ diff --git a/po/fi.po b/po/fi.po index 3086377..a5114d8 100644 --- a/po/fi.po +++ b/po/fi.po @@ -1,14 +1,15 @@ # Finnish messages for GNU tar. -# Copyright © 2002, 2003, 2004, 2006 Free Software Foundation, Inc. -# Lauri Nurmi , 2002-2006. +# Copyright © 2002, 2003, 2004, 2006, 2014 Free Software Foundation, Inc. +# This file is distributed under the same license as the tar package. +# Lauri Nurmi , 2002-2006, 2014. # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" -"Project-Id-Version: tar 1.16.1\n" +"Project-Id-Version: tar 1.27\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" -"PO-Revision-Date: 2006-12-09 18:58+0200\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" +"PO-Revision-Date: 2014-07-12 17:57+0300\n" "Last-Translator: Lauri Nurmi \n" "Language-Team: Finnish \n" "Language: fi\n" @@ -16,6 +17,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.6.5\n" #: gnu/argmatch.c:135 #, c-format @@ -34,7 +36,7 @@ msgstr "Kelvolliset argumentit ovat:" #: gnu/argp-help.c:150 #, c-format msgid "ARGP_HELP_FMT: %s value is less than or equal to %s" -msgstr "" +msgstr "ARGP_HELP_FMT: %s-arvo on pienempi tai yhtäsuuri kuin %s" #: gnu/argp-help.c:223 #, c-format @@ -77,9 +79,9 @@ msgid " [OPTION...]" msgstr " [VALITSIN...]" #: gnu/argp-help.c:1686 -#, fuzzy, c-format +#, c-format msgid "Try '%s --help' or '%s --usage' for more information.\n" -msgstr "Komennot â€%s --help†ja â€%s --usage†antavat lisää tietoa.\n" +msgstr "Kokeile â€%s --help†tai â€%s --usage†saadaksesi lisää tietoa.\n" #: gnu/argp-help.c:1714 #, c-format @@ -98,22 +100,22 @@ msgstr "näytä tämä ohje" msgid "give a short usage message" msgstr "näytä lyhyt käyttöohje" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "NIMI" #: gnu/argp-parse.c:85 msgid "set the program name" -msgstr "" +msgstr "aseta ohjelman nimi" #: gnu/argp-parse.c:86 msgid "SECS" -msgstr "" +msgstr "SEK" #: gnu/argp-parse.c:87 msgid "hang for SECS seconds (default 3600)" -msgstr "" +msgstr "odota SEK sekuntia (oletus 3600)" #: gnu/argp-parse.c:144 msgid "print program version" @@ -121,7 +123,7 @@ msgstr "näytä ohjelman versio" #: gnu/argp-parse.c:161 msgid "(PROGRAM ERROR) No version known!?" -msgstr "" +msgstr "(OHJELMAVIRHE) Tuntematon versio‽" #: gnu/argp-parse.c:614 #, c-format @@ -130,64 +132,64 @@ msgstr "%s: Liian monta argumenttia\n" #: gnu/argp-parse.c:757 msgid "(PROGRAM ERROR) Option should have been recognized!?" -msgstr "" +msgstr "(OHJELMAVIRHE) Valitsin olisi pitänyt tunnistaa‽" #: gnu/closeout.c:114 msgid "write error" -msgstr "" +msgstr "kirjoitusvirhe" #: gnu/getopt.c:549 gnu/getopt.c:578 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: valitsin â€%s†on moniselitteinen\n" +msgstr "%s: valitsin â€%s†on moniselitteinen; vaihtoehdot:" #: gnu/getopt.c:626 gnu/getopt.c:630 -#, fuzzy, c-format +#, c-format msgid "%s: option '--%s' doesn't allow an argument\n" msgstr "%s: valitsin â€--%s†ei salli argumenttia\n" #: gnu/getopt.c:639 gnu/getopt.c:644 -#, fuzzy, c-format +#, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" msgstr "%s: valitsin â€%c%s†ei salli argumenttia\n" #: gnu/getopt.c:687 gnu/getopt.c:706 -#, fuzzy, c-format +#, c-format msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: valitsin â€%s†vaatii argumentin\n" +msgstr "%s: valitsin â€--%s†vaatii argumentin\n" #: gnu/getopt.c:744 gnu/getopt.c:747 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '--%s'\n" msgstr "%s: tunnistamaton valitsin â€--%sâ€\n" #: gnu/getopt.c:755 gnu/getopt.c:758 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%c%s'\n" msgstr "%s: tunnistamaton valitsin â€%c%sâ€\n" #: gnu/getopt.c:807 gnu/getopt.c:810 -#, fuzzy, c-format +#, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "%s: virheellinen valitsin -- %c\n" +msgstr "%s: virheellinen valitsin -- â€%câ€\n" #: gnu/getopt.c:863 gnu/getopt.c:880 gnu/getopt.c:1090 gnu/getopt.c:1108 -#, fuzzy, c-format +#, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s: valitsin vaatii argumentin -- %c\n" +msgstr "%s: valitsin vaatii argumentin -- â€%câ€\n" #: gnu/getopt.c:936 gnu/getopt.c:952 -#, fuzzy, c-format +#, c-format msgid "%s: option '-W %s' is ambiguous\n" msgstr "%s: valitsin â€-W %s†on moniselitteinen\n" #: gnu/getopt.c:976 gnu/getopt.c:994 -#, fuzzy, c-format +#, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" msgstr "%s: valitsin â€-W %s†ei salli argumenttia\n" #: gnu/getopt.c:1015 gnu/getopt.c:1033 -#, fuzzy, c-format +#, c-format msgid "%s: option '-W %s' requires an argument\n" msgstr "%s: valitsin â€%s†vaatii argumentin\n" @@ -203,7 +205,7 @@ msgstr "Työhakemistoa ei voi vaihtaa" #: gnu/openat-die.c:59 #, fuzzy, c-format msgid "failed to return to initial working directory" -msgstr "Työhakemistoa ei voi tallentaa" +msgstr "alkuperäiseen työhakemistoon palaaminen epäonnistui" #. TRANSLATORS: #. Get translations for open and closing quotation marks. @@ -257,19 +259,19 @@ msgstr "^[eEnN]" #: gnu/version-etc.c:76 #, c-format msgid "Packaged by %s (%s)\n" -msgstr "" +msgstr "Paketoinut %s (%s)\n" #: gnu/version-etc.c:79 #, 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 #. locale. Otherwise, do not translate "(C)"; leave it as-is. #: gnu/version-etc.c:86 msgid "(C)" -msgstr "" +msgstr "©" #: gnu/version-etc.c:88 msgid "" @@ -280,24 +282,30 @@ 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. #: gnu/version-etc.c:104 -#, fuzzy, c-format +#, c-format msgid "Written by %s.\n" -msgstr "Kirjoittanut François Pinard." +msgstr "Kirjoittanut %s.\n" #. TRANSLATORS: Each %s denotes an author name. #: gnu/version-etc.c:108 -#, fuzzy, c-format +#, c-format msgid "Written by %s and %s.\n" -msgstr "Kirjoittanut François Pinard." +msgstr "Kirjoittaneet %s ja %s.\n" #. TRANSLATORS: Each %s denotes an author name. #: gnu/version-etc.c:112 -#, fuzzy, c-format +#, c-format msgid "Written by %s, %s, and %s.\n" -msgstr "Kirjoittanut François Pinard." +msgstr "Kirjoittaneet %s, %s ja %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -308,6 +316,8 @@ msgid "" "Written by %s, %s, %s,\n" "and %s.\n" msgstr "" +"Kirjoittaneet %s, %s,\n" +"%s ja %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -318,6 +328,8 @@ msgid "" "Written by %s, %s, %s,\n" "%s, and %s.\n" msgstr "" +"Kirjoittaneet %s, %s, %s,\n" +"%s ja %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -328,6 +340,8 @@ msgid "" "Written by %s, %s, %s,\n" "%s, %s, and %s.\n" msgstr "" +"Kirjoittaneet %s, %s, %s,\n" +"%s, %s ja %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -338,6 +352,8 @@ msgid "" "Written by %s, %s, %s,\n" "%s, %s, %s, and %s.\n" msgstr "" +"Kirjoittaneet %s, %s, %s,\n" +"%s, %s, %s ja %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -349,6 +365,9 @@ msgid "" "%s, %s, %s, %s,\n" "and %s.\n" msgstr "" +"Kirjoittaneet %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s ja %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -360,6 +379,9 @@ msgid "" "%s, %s, %s, %s,\n" "%s, and %s.\n" msgstr "" +"Kirjoittaneet %s, %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s ja %s.\n" #. TRANSLATORS: Each %s denotes an author name. #. You can use line breaks, estimating that each author name occupies @@ -371,48 +393,48 @@ msgid "" "%s, %s, %s, %s,\n" "%s, %s, and others.\n" msgstr "" +"Kirjoittaneet %s, %s,\n" +"%s, %s, %s, %s,\n" +"%s, %s, %s ja muut.\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). #: gnu/version-etc.c:247 -#, fuzzy, c-format +#, c-format msgid "" "\n" "Report bugs to: %s\n" -msgstr "Ilmoita ohjelmistovioista (englanniksi) osoitteeseen %s.\n" +msgstr "" +"\n" +"Ilmoita ohjelmistovioista (englanniksi) osoitteeseen: %s\n" #: gnu/version-etc.c:249 -#, fuzzy, c-format +#, c-format msgid "Report %s bugs to: %s\n" -msgstr "" -"\n" -"Ohjelmistovioista voi ilmoittaa (englanniksi) osoitteeseen\n" -"<%s>.\n" +msgstr "Ilmoita %s-vioista (englanniksi) osoitteeseen %s.\n" #: gnu/version-etc.c:253 #, c-format msgid "%s home page: <%s>\n" -msgstr "" +msgstr "%s-kotisivu: <%s>\n" #: gnu/version-etc.c:255 #, c-format msgid "%s home page: \n" -msgstr "" +msgstr "%s-kotisivu: \n" #: gnu/version-etc.c:258 msgid "General help using GNU software: \n" msgstr "" +"Yleisohjeita GNU-ohjelmistojen käyttöön: \n" -# Onpa taas NIIN hyvin lokalisoitavissa tämä. -# Käytännössä saattaa esiintyä esim. muodossa -# "tar: Cannot mkfifo: File exists" #. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'. #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: Toimintoa %s ei voi suorittaa" @@ -421,56 +443,56 @@ msgstr "%s: Toimintoa %s ei voi suorittaa" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: Varoitus: Toimintoa %s ei voi suorittaa" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: Oikeuksien muuttaminen tilaan %s ei onnistu" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: Tiedoston omistusta ei voi muuttaa arvoon uid=%lu, gid=%lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: Kovaa linkkiä tiedostoon %s ei voi luoda" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Lukuvirhe tavun %s kohdalla luettaessa %lu tavua" msgstr[1] "%s: Lukuvirhe tavun %s kohdalla luettaessa %lu tavua" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Varoitus: Lukuvirhe tavun %s kohdalla luettaessa %lu tavua" msgstr[1] "%s: Varoitus: Lukuvirhe tavun %s kohdalla luettaessa %lu tavua" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: Siirtyminen kohtaan %s ei onnistu" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: Varoitus: Siirtyminen kohtaan %s ei onnistu" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: Tiedostoon %s ei voida luoda symlinkkiä" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -513,7 +535,7 @@ msgstr "vakiotuloste" #: lib/rtapelib.c:429 #, c-format msgid "Cannot connect to %s: resolve failed" -msgstr "" +msgstr "Ei voi yhdistää kohteeseen %s: nimenselvitys epäonnistui" #: lib/rtapelib.c:502 #, fuzzy, c-format @@ -530,76 +552,70 @@ msgid "Seek direction out of range" msgstr "Siirtymän suunta sallitun välin ulkopuolella" #: rmt/rmt.c:438 -#, fuzzy msgid "Invalid seek direction" -msgstr "Valitsimelle annettiin virheellinen tila" +msgstr "Virheellinen siirtymän suunta" #: rmt/rmt.c:446 -#, fuzzy msgid "Invalid seek offset" -msgstr "Virheellinen koko: %s" +msgstr "Virheellinen siirtymän arvo" #: rmt/rmt.c:452 msgid "Seek offset out of range" msgstr "Siirtymä sallitun välin ulkopuolella" #: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608 -#, fuzzy msgid "Invalid byte count" -msgstr "Virheellinen nauhan pituus" +msgstr "Virheellinen tavumäärä" #: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625 -#, fuzzy msgid "Byte count out of range" -msgstr "Siirtymä sallitun välin ulkopuolella" +msgstr "Tavumäärä sallitun välin ulkopuolella" #: rmt/rmt.c:558 -#, fuzzy msgid "Premature eof" -msgstr "rmtd: Ennenaikainen tiedoston loppu\n" +msgstr "Ennenaikainen tiedoston loppu" #: rmt/rmt.c:601 #, fuzzy msgid "Invalid operation code" -msgstr "Päätoimintatila:" +msgstr "Virheellinen objekti operaatiolle" #: rmt/rmt.c:636 rmt/rmt.c:680 msgid "Operation not supported" -msgstr "" +msgstr "Toiminto ei ole tuettu" #: rmt/rmt.c:664 -#, fuzzy msgid "Unexpected arguments" -msgstr "Odottamaton tiedoston loppu arkistossa" +msgstr "Odottamattomat argumentit" #: rmt/rmt.c:689 msgid "Manipulate a tape drive, accepting commands from a remote process" -msgstr "" +msgstr "Ohjaa nauha-asemaa, hyväksyen komentoja etäprosessilta" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "MÄÄRÄ" #: rmt/rmt.c:697 msgid "set debug level" -msgstr "" +msgstr "aseta vianjäljityksen taso" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "TIED" #: rmt/rmt.c:699 msgid "set debug output file name" -msgstr "" +msgstr "aseta vianjäljityksen tulostetiedoston nimi" #: rmt/rmt.c:715 rmt/rmt.c:783 -#, fuzzy, c-format +#, c-format msgid "cannot open %s" -msgstr "%s: Siirtyminen kohtaan %s ei onnistu" +msgstr "tiedostoa %s ei voi avata" #: rmt/rmt.c:780 tests/genfile.c:892 tests/genfile.c:909 #, c-format @@ -610,105 +626,113 @@ msgstr "liian monta argumenttia" msgid "Garbage command" msgstr "Roskakomento" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Tämä ei näytä tar-arkistolta" -#: src/buffer.c:521 src/buffer.c:530 +#: src/buffer.c:574 +msgid "Total bytes read" +msgstr "Luettuja tavuja yhteensä" + +#: src/buffer.c:576 msgid "Total bytes written" msgstr "Kirjoitettuja tavuja yhteensä" -#: src/buffer.c:528 src/buffer.c:542 -msgid "Total bytes read" -msgstr "" - -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Poistettuja tavuja yhteensä: %s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(putki)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "Virheellinen arvo kentälle record_size" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Arkiston nimeä ei ole annettu" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Vakiosyötteessä/tulosteessa olevaa arkistoa ei voi varmistaa" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Arkisto on tiivistetty. Käytä valitsinta %s" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Pakattuja arkistoja ei voi päivittää" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "Nauhan alussa, lopetetaan" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "Liian monta virhettä, lopetetaan" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Tietueen koko = %lu lohko" msgstr[1] "Tietueen koko = %lu lohkoa" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "Kohdistamaton lohko (%lu tavu) arkistossa" msgstr[1] "Kohdistamaton lohko (%lu tavua) arkistossa" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" "Arkistossa ei voi siirtyä taaksepäin; sitä ei ehkä voi lukea ilman " "valitsinta -i" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek ei pysähtynyt tietueen rajalle" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: sisältää virheellisen arkiston osan järjestysnumeron" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "Arkisto-osan järjestysnumeron ylivuoto" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Valmistele osa #%d arkistolle %s ja paina return: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "Tiedoston loppu odotetun käyttäjän syötteen sijaan" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "VAROITUS: Arkisto on epätäydellinen" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -720,67 +744,67 @@ msgstr "" " q Keskeytä tar\n" " y tai rivinv. Jatka suoritusta\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Käynnistä alikuori\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? Näytä tämä lista\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Ei uutta arkiston osaa, poistutaan.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "Tiedostonimeä ei annettu. Yritä uudelleen.\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" -msgstr "" +msgstr "Virheellinen syöte. Kirjoita ? ohjeen näyttämiseksi.\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "Komento %s epäonnistui" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" "%s jatkuu mahdollisesti tällä arkiston osalla: otsake sisältää typistetyn " "nimen" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s ei jatku tällä arkiston osalla" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s on väärän kokoinen (%s ≠ %s + %s)" -#: src/buffer.c:1473 -#, fuzzy, c-format +#: src/buffer.c:1524 +#, c-format msgid "This volume is out of sequence (%s - %s != %s)" -msgstr "Tämä arkiston osa ei ole järjestyksessä" +msgstr "Tämä arkiston osa epäjärjestyksessä (%s - %s ≠ %s)" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "Arkistoa ei ole nimetty täsmää nimiöön %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "Arkiston osa %s ei täsmää nimiöön %s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -788,10 +812,9 @@ msgstr "" "%s: tiedostonimi on liian pitkä tallennettavaksi moniosaisen GNU-arkiston " "otsakkeeseen; nimi typistetty" -#: src/buffer.c:1866 -#, fuzzy +#: src/buffer.c:1917 msgid "write did not end on a block boundary" -msgstr "rmtlseek ei pysähtynyt tietueen rajalle" +msgstr "kirjoitus ei päättynyt lohkon rajalle" #: src/compare.c:96 #, c-format @@ -800,16 +823,16 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Voitiin lukea vain %lu tavua %lu tavusta" msgstr[1] "Voitiin lukea vain %lu tavua %lu tavusta" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "Sisällöt eroavat" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "Odottamaton tiedoston loppu arkistossa" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "Tiedoston tyyppi eroaa" @@ -829,7 +852,7 @@ msgstr "GID eroaa" msgid "Mod time differs" msgstr "Muutosaika eroaa" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Koko eroaa" @@ -846,38 +869,37 @@ msgstr "Symlinkki eroaa" msgid "Device number differs" msgstr "Laitenumero eroaa" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Tarkasta " -#: src/compare.c:471 -#, fuzzy, c-format +#: src/compare.c:473 +#, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "%s: Tuntematon tiedostotyyppi â€%câ€, vertailtu normaalina tiedostona" # Mitäh? -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "Arkisto sisältää tiedostonimiä, joiden etuliitteet on poistettu." -#: src/compare.c:533 -#, fuzzy +#: src/compare.c:535 msgid "Archive contains transformed file names." -msgstr "Arkisto sisältää käytöstä poistuvia base-64-otsakkeita" +msgstr "Arkisto sisältää muunnettuja tiedostonimiä." -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "Tarkastus ei ehkä löydä alkuperäisiä tiedostoja." -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "TARKASTUSVIRHE: havaittu %d virheellinen otsake" msgstr[1] "TARKASTUSVIRHE: havaittu %d virheellistä otsaketta" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "Yksinäinen nollalohko kohdassa %s" @@ -885,7 +907,7 @@ msgstr "Yksinäinen nollalohko kohdassa %s" #: src/create.c:73 #, fuzzy, c-format msgid "%s: contains a cache directory tag %s; %s" -msgstr "%s: näyttää välimuistihakemistolta, ei lisätä" +msgstr "Välimuistihakemistoa %s ei voi avata\n" #: src/create.c:262 #, c-format @@ -923,56 +945,55 @@ msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "%s: Tiedosto kutistui %s tavun verran, tasataan nollilla" msgstr[1] "%s: Tiedosto kutistui %s tavun verran, tasataan nollilla" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: tiedosto ei ole samalla tiedostojärjestelmällä, ei lisätä" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" -msgstr "" +msgstr "sisältöä ei lisätty" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Tuntematon tiedostotyyppi, tiedostoa ei huomioida" -#: src/create.c:1549 +#: src/create.c:1551 #, fuzzy, c-format msgid "Missing links to %s." -msgstr "Puuttuvat linkit tiedostoon %s.\n" +msgstr "%s:n jälkeen puuttuu operandi" -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: tiedosto on muuttumaton, ei lisätä" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: tiedosto on arkistossa, ei lisätä" -#: src/create.c:1747 src/incremen.c:603 -#, fuzzy +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" -msgstr "%s: näyttää välimuistihakemistolta, ei lisätä" +msgstr "hakemistoa ei lisätty" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: tiedosto muuttui lukemisen aikana" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: pistoketta ei huomioida" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: ovea ei huomioida" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Siirrytään seuraavaan otsakkeeseen" @@ -998,7 +1019,7 @@ msgstr "%s: Odottamaton ristiriita luotaessa hakemistoa" #: src/extract.c:705 #, c-format msgid "%s: skipping existing file" -msgstr "" +msgstr "%s: ohitetaan olemassa oleva tiedosto" #: src/extract.c:821 #, c-format @@ -1018,10 +1039,10 @@ msgstr "Yritetään purkaa symboliset linkit koviksi linkeiksi" msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Ei voi purkaa -- tiedosto on jatkoa toisesta arkiston osasta" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 #, fuzzy msgid "Unexpected long name header" -msgstr "Odottamaton tiedoston loppu sovitetuissa nimissä" +msgstr "Liian pitkä tiedostonimi" #: src/extract.c:1542 #, fuzzy, c-format @@ -1054,7 +1075,7 @@ msgid "%s: Directory is new" msgstr "%s: Hakemisto on uusi" #: src/incremen.c:566 -#, fuzzy, c-format +#, c-format msgid "%s: directory is on a different filesystem; not dumped" msgstr "%s: tiedosto ei ole samalla tiedostojärjestelmällä, ei lisätä" @@ -1063,158 +1084,158 @@ msgstr "%s: tiedosto ei ole samalla tiedostojärjestelmällä, ei lisätä" msgid "%s: Directory has been renamed" msgstr "%s: Hakemisto on nimetty uudelleen" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "Virheellinen aikaleima" -#: src/incremen.c:1045 -#, fuzzy +#: src/incremen.c:1047 msgid "Invalid modification time" -msgstr "Virheellinen muutosaika (sekunnit)" +msgstr "Virheellinen muutosaika" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "Virheellinen muutosaika (nanosekunnit)" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "Virheellinen laitenumero" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Virheellinen i-solmun numero" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" -msgstr "" +msgstr "%s: tavu %s: %s %.*s... liian pitkä" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Odottamaton tiedoston loppu arkistossa" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" -msgstr "" +msgstr "%s: tavu %s: %s %s" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" -msgstr "" +msgstr "%s: tavu %s: %s" -#: src/incremen.c:1260 +#: src/incremen.c:1262 +#, fuzzy msgid "Missing record terminator" -msgstr "" +msgstr "puuttuva â€]â€" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 +#, fuzzy msgid "Bad incremental file format" -msgstr "" +msgstr "Virheellinen kirjasintiedoston muoto" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1566 +#: src/incremen.c:1568 #, fuzzy msgid "Malformed dumpdir: empty name in 'R'" msgstr "Kelvoton tiheysargumentti: â€%sâ€" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1585 -#, fuzzy +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" -msgstr "Kelvoton tiheysargumentti: â€%sâ€" +msgstr "" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Väliaikaishakemiston luominen %s-mallia käyttäen ei onnistu" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Ei poisteta hakemistoa: stat ei onnistu" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: hakemisto on eri laitteella, ei poisteta" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Poistetaan %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: Ei voi poistaa" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: Jätetään pois" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "lohko %s: ** NUL-lohko **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "lohko %s: ** Tiedoston loppu **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "lohko %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Tyhjiä merkkejä otsakkeessa, odotettiin numeerista %s-arvoa" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1222,181 +1243,181 @@ msgstr "" "kahden komplementiksi" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Arkiston oktaaliarvo %.*s on sallitun %s-välin ulkopuolella" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "Arkisto sisältää käytöstä poistuvia base-64-otsakkeita" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" "Arkiston etumerkillinen base-64-merkkijono %s on sallitun %s-välin " "ulkopuolella" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Arkiston base-256-arvo on sallitun %s-välin ulkopuolella" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Arkisto sisältää merkkijonon %.*s, odotettiin numeerista %s-arvoa" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Arkiston arvo %s on sallitun %s-välin %s..%s ulkopuolella" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " linkki tiedostoon %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " tuntematon tiedostotyyppi %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--Pitkä linkki--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--Pitkä nimi--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Arkiston osan otsake--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Jatkuu tavusta %s--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Luodaan hakemisto:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "Nimetään uudelleen %s -> %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Uudelleennimeäminen nimelle %s ei onnistu" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "Nimetään %s takaisin nimelle %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Tiedosto oli poistettu ennen sen lukemista" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "lapsiprosessi" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "prosessienvälinen kanava" #: src/names.c:360 -#, fuzzy msgid "command line" -msgstr "Komento %s epäonnistui" +msgstr "komentorivi" #: src/names.c:378 #, fuzzy, c-format msgid "%s: file list requested from %s already read from %s" msgstr "%s: tiedosto on arkistossa, ei lisätä" -#: src/names.c:448 -#, fuzzy, c-format +#: src/names.c:448 src/checkpoint.c:274 +#, c-format msgid "cannot split string '%s': %s" -msgstr "%s: Siirtyminen kohtaan %s ei onnistu" +msgstr "merkkijonoa â€%s†ei voi jakaa osiin: %s" #: src/names.c:490 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: tiedostonimi sisältää nul-merkin" -# ... ja sen pitää päätyä kääntäjien ongelmaksi? -#: src/names.c:821 -#, fuzzy +#: src/names.c:824 msgid "Pattern matching characters used in file names" -msgstr "Tiedostonimissä on käytetty jokerimerkkejä. Käytä" +msgstr "Tiedostonimissä on käytetty jokerimerkkejä" -#: src/names.c:823 -#, fuzzy +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" -msgstr "valitsinta --wildcards täsmäyksen käyttöön ottamiseksi, tai" +msgstr "" +"Käytä valitsinta --wildcards täsmäyksen käyttöön ottamiseksi, tai --no-" +"wildcards tämän varoituksen hiljentämiseksi" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: Ei löytynyt arkistosta" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Vaadittua esiintymää ei löytynyt arkistosta" -#: src/names.c:876 -#, fuzzy, c-format +#: src/names.c:879 +#, c-format msgid "Archive label mismatch" -msgstr "Arkistoa ei ole nimetty täsmää nimiöön %s" +msgstr "Arkiston nimiö ei täsmää" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" +"Vain yksi -C-valitsin on sallittu valitsimen --listed-incremental kanssa" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "Kumpikin valitsimista â€-%s†ja â€-%s†käyttää vakiosyötettä" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s: Virheellinen arkistomuoto" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "" "Haluttiin käyttää GNU-ominaisuuksia yhteensopimattoman arkistomuodon kanssa" -#: src/tar.c:255 +#: src/tar.c:264 #, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." msgstr "" +"Tuntematon lainaustyyli â€%sâ€. Kokeile â€%s --quoting-style=help†saadaksesi " +"listan." -#: src/tar.c:364 -#, fuzzy +#: src/tar.c:378 msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1406,7 +1427,7 @@ msgid "" " tar -tvf archive.tar # List all files in archive.tar verbosely.\n" " tar -xf archive.tar # Extract all files from archive.tar.\n" msgstr "" -"GNU â€tar†tallentaa useita tiedostoja yhteen nauha- tai levyarkistoon, ja\n" +"GNU â€tar†tallentaa useita tiedostoja yhteen nauha- tai levyarkistoon, ja " "pystyy palauttamaan yksittäisiä tiedostoja arkistosta.\n" "\n" "Esimerkkejä:\n" @@ -1414,8 +1435,7 @@ msgstr "" " %s -tvf arkisto.tar # Listaa kaikki arkisto.tar:in tiedostot.\n" " %s -xf arkisto.tar # Pura kaikki tiedostot arkisto.tar:ista.\n" -#: src/tar.c:373 -#, fuzzy +#: src/tar.c:387 msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" "The version control may be set with --backup or VERSION_CONTROL, values " @@ -1436,79 +1456,80 @@ msgstr "" " muuten yksinkertaisia\n" " never, simple tee aina yksinkertaisia varmuuskopioita\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "Päätoimintatila:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "listaa arkiston sisältö" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "pura tiedostoja arkistosta" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "luo uusi arkisto" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "etsi arkiston ja tiedostojärjestelmän väliset erot" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "lisää tiedostoja arkiston loppuun" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "lisää vain arkistokopiota uudemmat tiedostot" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "lisää tar-tiedostoja arkistoon" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "poista tiedostoja arkistosta (ei toimi magneettinauhoilla!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "Toimintovalinnat:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "käsittele harvat tiedostot tehokkaasti" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" -msgstr "" +msgstr "MAJOR[.MINOR]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" +"aseta käytettävän harvan muodon versio (valitsin --sparse tulee käyttöön)" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "käsittele vanha GNU-muotoinen lisääntyvä varmuuskopio" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "käsittele uusi GNU-muotoinen lisääntyvä varmuuskopio" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "jatka lukukelvottomista tiedostoista huolimatta" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1521,361 +1542,373 @@ msgstr "" "annettu komentirivillä tai -T-valitsimella; oletusMÄÄRÄ on 1" # Muualla seek on siirtymistä... -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "arkisto on selattava" # Muualla seek on siirtymistä... -#: src/tar.c:453 -#, fuzzy +#: src/tar.c:467 msgid "archive is not seekable" -msgstr "arkisto on selattava" +msgstr "arkisto ei ole selattava" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" -msgstr "" +msgstr "Ylikirjoituksen hallinta:" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "yritä varmistaa arkisto kirjoittamisen jälkeen" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "poista tiedostot arkistoon lisäämisen jälkeen" -#: src/tar.c:471 -#, fuzzy +#: src/tar.c:485 msgid "don't replace existing files when extracting, treat them as errors" -msgstr "älä korvaa olemassaolevia tiedostoja purettaessa" +msgstr "" +"älä korvaa olemassa olevia tiedostoja purettaessa, käsittele ne virheinä" -#: src/tar.c:474 -#, fuzzy +#: src/tar.c:488 msgid "don't replace existing files when extracting, silently skip over them" -msgstr "älä korvaa olemassaolevia tiedostoja purettaessa" +msgstr "" +"älä korvaa olemassa olevia tiedostoja purettaessa, ohita ne hiljaisesti" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -"älä korvaa olemassaolevia tiedostoja, jotka ovat arkistokopioitaan uudempia" +"älä korvaa olemassa olevia tiedostoja, jotka ovat arkistokopioitaan uudempia" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" -msgstr "ylikirjoita olemassaolevat tiedostot purettaessa" +msgstr "ylikirjoita olemassa olevat tiedostot purettaessa" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "poista jokainen tiedosto ennen sen päälle purkamista" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "tyhjennä rakenne ennen hakemiston purkamista" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" -msgstr "säilytä olemassaolevien hakemistojen metatiedot" +msgstr "säilytä olemassa olevien hakemistojen metatiedot" -#: src/tar.c:487 -#, fuzzy +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" -msgstr "ylikirjoita olemassaolevat tiedostot purettaessa" +msgstr "" +"ylikirjoita purettaessa olemassa olevien hakemistojen metadata (oletus)" -#: src/tar.c:490 -#, fuzzy +#: src/tar.c:504 msgid "preserve existing symlinks to directories when extracting" -msgstr "ylikirjoita olemassaolevat tiedostot purettaessa" +msgstr "säilytä purettaessa olemassa olevat symlinkit hakemistoihin" + +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "HAK" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" -#: src/tar.c:496 +#: src/tar.c:513 msgid "Select output stream:" -msgstr "Valitse tulostusvirta:" +msgstr "Tulostevirran valinta:" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "pura tiedostot vakiotulosteeseen" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "KOMENTO" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "putkita puretut tiedostot toiselle ohjelmalle" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "jätä lapsiprosessien paluuarvot huomiotta" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "käsittele lapsiprosessien nollasta poikkeavat paluuarvot virheinä" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Tiedostojen ominaisuuksien käsittely:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "pakota NIMI lisättyjen tiedostojen omistajaksi" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "pakota NIMI lisättyjen tiedostojen ryhmäksi" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "PÄIVÄYS-TAI-TIED" -#: src/tar.c:517 +#: src/tar.c:534 #, fuzzy msgid "set mtime for added files from DATE-OR-FILE" msgstr "tallenna vain PÄIVÄYS-TAI-TIEDostoa uudemmat tiedostot" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "MUUTOS" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "pakota (symbolinen) tila MUUTOS lisätyille" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" -msgstr "" +msgstr "TAPA" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " "place (METHOD='system')" msgstr "" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "älä pura tiedoston muutosaikaa" -#: src/tar.c:528 -#, fuzzy +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" -msgstr "yritä purkaa tiedostot samalla omistajuudella" +msgstr "yritä purkaa tiedostot samalla omistajuudella (oletus pääkäyttäjälle)" -#: src/tar.c:530 -#, fuzzy +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" -msgstr "pura tiedostot itsenäsi" +msgstr "pura tiedostot itsenäsi (oletus tavallisille käyttäjille)" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "käytä aina numeroita käyttäjän/ryhmän nimissä" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" -msgstr "" +msgstr "pura tieto tiedostojen oikeuksista (oletus pääkäyttäjälle)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" +"sovella käyttäjän umaskia purettaessa tiedostojen oikeuksia arkistosta " +"(oletus tavallisille käyttäjille)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "sama kuin -p ja -s yhdessä" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:554 -#, fuzzy +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 msgid "Handling of extended file attributes:" -msgstr "Tiedostojen ominaisuuksien käsittely:" +msgstr "Tiedostojen lisämääreiden käsittely:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" -msgstr "" +msgstr "Ota käyttöön lisämääreiden tuki" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" -msgstr "" +msgstr "Poista käytöstä lisämääreiden tuki" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" msgstr "" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" msgstr "" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" -msgstr "" +msgstr "Ota käyttöön SELinux-kontekstin tuki" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" -msgstr "" +msgstr "Poista käytöstä SELinux-kontekstin tuki" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" -msgstr "" +msgstr "Ota käyttöön POSIX ACLs -tuki" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" -msgstr "" +msgstr "Poista käytöstä POSIX ACLs -tuki" -#: src/tar.c:576 -#, fuzzy +#: src/tar.c:600 msgid "Device selection and switching:" -msgstr "Laitteen valinta ja vaihtaminen:\n" +msgstr "Laitteen valinta ja vaihtaminen:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ARKISTO" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "käytä arkistotiedostoa tai -laitetta ARKISTO" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "arkisto on paikallinen vaikka nimessä olisi kaksoispiste" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "käytä rmt-KOMENTOA rmt:n sijaan" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "käytä etäKOMENTOa rsh:n sijaan" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "anna asema ja tiheys" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "luo/listaa/pura moniosainen arkisto" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "vaihda nauhaa MÄÄRÄ × 1024 kirjoitetun tavun jälkeen" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "aja skripti joka nauhan lopussa (valitsin -M tulee käyttöön)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "käytä/päivitä arkiston osan numero TIEDostossa" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "Laitteen lohkot:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "LOHKOT" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "LOHKOT × 512 tavua tietuetta kohti" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "MÄÄRÄ tavua tietuetta kohti, 512:n monikerta" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "älä huomioi nollattuja lohkoja arkistossa (merkitsee tiedoston loppua)" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "suorita lohkominen uudelleen luettaessa (4.2BSD-putkia varten)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "Arkistomuodon valinta:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "MUOTO" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "luo annetun muotoinen arkisto" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "MUOTO on yksi seuraavista:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "vanha V7-tar-muoto" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "GNU-muoto tar-versioilla ≤ 1.12" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x -muoto" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) -muoto" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) -muoto" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "sama kuin pax" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "sama kuin --format=v7" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "sama kuin --format=posix" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "avainsana[[:]=arvo][,avainsana[[:]=arvo]]..." -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "määrittele pax-avainsanoja" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "TEKSTI" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1883,176 +1916,182 @@ msgstr "" "luo arkisto nimiöllä TEKSTI. Listattaessa/purettaessa käytä TEKSTIä " "nimiönhakulausekkeena" -#: src/tar.c:660 -#, fuzzy +#: src/tar.c:684 msgid "Compression options:" -msgstr "Ristiriitaiset pakkausvalitsimet" +msgstr "Tiivistysvalinnat:" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" -msgstr "" +msgstr "käytä arkiston päätettä tiivistysohjelman päättelemiseen" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "OHJ" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "ohjaa OHJelman läpi (on hyväksyttävä -d)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "Paikallisten tiedostojen valinta:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" "lisää annettu TIEDosto arkistoon (hyödyllinen, jos nimi alkaa viivalla)" -#: src/tar.c:687 -msgid "DIR" -msgstr "HAK" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "siirry hakemistoon HAK" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "hae purettavat/luotavat nimet TIEDOSTOsta" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "-T lukee nollaan päättyviä nimiä, poistaa käytöstä -C:n" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +msgid "unquote input file or member names (default)" msgstr "" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +msgid "do not unquote input file or member names" msgstr "" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "HAHMO" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "jätä pois HAHMOn mukaiset tiedostot" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "jätä pois TIEDOSTOssa listatut hahmot" -#: src/tar.c:704 -#, fuzzy +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" -msgstr "jätä pois välimuistihakemistot" +msgstr "" +"jätä pois CACHEDIR.TAGin sisältävät hakemistot, lukuunottamatta tag-" +"tiedostoa itseään" -#: src/tar.c:707 -#, fuzzy +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" -msgstr "jätä pois TIEDOSTOn sisältävät hakemistot" +msgstr "jätä pois kaikki hakemistojen alta, jotka sisältävät CACHEDIR.TAGin" -#: src/tar.c:710 -#, fuzzy +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" -msgstr "jätä pois TIEDOSTOn sisältävät hakemistot" +msgstr "jätä pois CACHEDIR.TAGin sisältävät hakemistot" -#: src/tar.c:712 -#, fuzzy +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" -msgstr "jätä pois TIEDOSTOn sisältävät hakemistot" +msgstr "" +"jätä pois TIEDOSTOn sisältävien hakemistojen sisältö, lukuun ottamatta " +"TIEDOSTOa itseään" -#: src/tar.c:715 -#, fuzzy +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" -msgstr "jätä pois TIEDOSTOn sisältävät hakemistot" +msgstr "jätä pois kaikki hakemistojen alta, jotka sisältävät TIEDOSTOn" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "jätä pois TIEDOSTOn sisältävät hakemistot" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" -msgstr "" +msgstr "jätä pois versionhallintajärjestelmän hakemistot" + +#: src/tar.c:751 +#, fuzzy +msgid "read exclude patterns from the VCS ignore files" +msgstr "poisjättöhahmot ovat tavallisia merkkijonoja" -#: src/tar.c:721 +#: src/tar.c:753 msgid "exclude backup and lock files" -msgstr "" +msgstr "jätä pois varmuuskopio- ja lukkotiedostot" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "estä automaattinen eteneminen alihakemistoihin" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "pysy nykyisessä tiedostojärjestelmässä arkistoa luotaessa" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "etene alihakemistoihin (oletus)" -#: src/tar.c:729 -#, fuzzy +#: src/tar.c:761 msgid "don't strip leading '/'s from file names" msgstr "älä poista â€/â€-merkkiä tiedostonimien alusta" -#: src/tar.c:731 -#, fuzzy +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" -msgstr "seuraa symlinkkejä; " +msgstr "seuraa symlinkkejä; arkistoi ja lisää niiden osoittamat tiedostot" -#: src/tar.c:733 -#, fuzzy +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" -msgstr "seuraa symlinkkejä; " +msgstr "seuraa kovia linkkejä; arkistoi ja lisää niiden osoittamat tiedostot" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "TIED-NIMI" -#: src/tar.c:735 +#: src/tar.c:767 #, fuzzy msgid "begin at member MEMBER-NAME when reading the archive" msgstr "aloita arkiston tiedostosta TIED-NIMI" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "tallenna vain PÄIVÄYS-TAI-TIEDostoa uudemmat tiedostot" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "PÄIVÄYS" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "vertaa vain tiedoston muutosaikaa" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "HALLINTA" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "varmuuskopiointi ennen poistoa, valitse versionHALLINTA" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "MERKKIJONO" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -2060,229 +2099,230 @@ msgstr "" "varmuuskopiointi ennen poistoa, älä käytä tavanomaista jälkiliitettä (joka " "on â€~â€, ellei muuttujaa SIMPLE_BACKUP_SUFFIX ole asetettu)" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" -msgstr "" +msgstr "Tiedostonimien muunnokset:" -#: src/tar.c:751 -#, fuzzy +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" -msgstr "poista MÄÄRÄn verran osia tiedostonimien alusta" +msgstr "poista MÄÄRÄn verran osia tiedostonimien alusta purettaessa" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" -msgstr "" +msgstr "LAUSEKE" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" -msgstr "" +msgstr "käytä sedin korvausLAUSEKEtta tiedostonimien muuntamiseen" -#: src/tar.c:760 +#: src/tar.c:792 +#, fuzzy msgid "File name matching options (affect both exclude and include patterns):" -msgstr "" +msgstr "Tiedostonimien täsmäysvalinnat (vaikuttava sekä " -#: src/tar.c:763 -#, fuzzy +#: src/tar.c:795 msgid "ignore case" -msgstr "poisjättäminen ei huomioi kirjainkokoa" +msgstr "älä huomioi kirjainkokoa" -#: src/tar.c:765 +#: src/tar.c:797 #, fuzzy msgid "patterns match file name start" msgstr "poisjättöhahmoja verrataan nimen alkuun" -#: src/tar.c:767 +#: src/tar.c:799 #, fuzzy msgid "patterns match after any '/' (default for exclusion)" msgstr "poisjättöhahmoja verrataan jokaisen â€/â€:n jälkeen" -#: src/tar.c:769 -#, fuzzy +#: src/tar.c:801 msgid "case sensitive matching (default)" -msgstr "poisjättäminen huomioi kirjainkoon (oletus)" +msgstr "kirjainkoon huomioiva täsmäys (oletus)" -#: src/tar.c:771 +#: src/tar.c:803 +#, fuzzy msgid "use wildcards (default for exclusion)" -msgstr "" +msgstr "Käytettävä muoto: â€newâ€, â€old†tai â€compat†(oletus)" -#: src/tar.c:773 +#: src/tar.c:805 +#, fuzzy msgid "verbatim string matching" -msgstr "" +msgstr "MERKKIJONO" -#: src/tar.c:775 +#: src/tar.c:807 #, fuzzy msgid "wildcards do not match '/'" -msgstr "poisjättöhahmon jokerimerkit eivät täsmää â€/â€-merkkiin" +msgstr "Ei vastaavuutta" -#: src/tar.c:777 +#: src/tar.c:809 #, fuzzy msgid "wildcards match '/' (default for exclusion)" msgstr "poisjättöhahmon jokerimerkit vastaavat merkkiä â€/â€" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Tietoja antava tuloste:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "listaa käsiteltävät tiedostot" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" -msgstr "" +msgstr "AVAINSANA" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" -msgstr "" +msgstr "varoitusten hallinta" -#: src/tar.c:789 -#, fuzzy +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" -msgstr "näytä edistymisviesti 10 sekunnin välein" +msgstr "näytä edistymisviesti MÄÄRÄn tietueen välein (oletus 10)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" -msgstr "" +msgstr "TOIMINTO" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" -msgstr "" +msgstr "suorita TOIMINTO jokaisen tarkistuspisteen kohdalla" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "näytä viesti, ellei kaikkia linkkejä lisätty" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" -msgstr "" +msgstr "SIGNAALI" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " "SIGQUIT, SIGINT, SIGUSR1 and SIGUSR2; the names without SIG prefix are also " "accepted" msgstr "" +"tulosta tavujen kokonaismäärä arkiston käsittelyn järkeen; argumentin - " +"kanssa tulostaa kokonaistavut kun SIGNAALI vastaanotetaan; Sallitut " +"signaalit ovat: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 ja SIGUSR2; myös nimet " +"ilman SIG-etuliitettä kelpaavat" -#: src/tar.c:802 -#, fuzzy +#: src/tar.c:834 msgid "print file modification times in UTC" msgstr "näytä tiedostojen muutosajat UTC-aikoina" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" -msgstr "" +msgstr "näytä tiedoston aikaleima täydellä tarkkuudella" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "ohjaa monisanainen tuloste TIEDostoon" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "näytä lohkonumero arkistossa viestien yhteydessä" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "kysy varmistusta jokaiselle toiminnolle" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "näytä tarin oletukset" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" "luettele hakuehtoihin täsmäämättömät hakemistot luetellessa tai purettaessa" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" -msgstr "" +msgstr "näytä tiedosto- tai arkistonimet muunnoksen jälkeen" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" -msgstr "" +msgstr "TYYLI" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "Yhteensopivuusvalitsimet:" -#: src/tar.c:835 -#, fuzzy +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -"luotaessa sama kuin --old-archive purettaessa sama kuin --no-same-owner" +"luotaessa sama kuin --old-archive; purettaessa sama kuin --no-same-owner" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "Muut valitsimet:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "poista käytöstä joitakin potentiaalisesti vahingollisia valitsimia" -#: src/tar.c:978 -#, fuzzy +#: src/tar.c:1010 msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" -msgstr "Vain yhtä valitsimista â€-Acdtrux†voi käyttää kerrallaan" +msgstr "" +"Vain yhtä valitsimista â€-Acdtruxâ€, â€--delete†tai â€--test-label†voi käyttää " +"kerrallaan" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Ristiriitaiset pakkausvalitsimet" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "Tuntematon signaalin nimi: %s" -#: src/tar.c:1071 +#: src/tar.c:1103 #, fuzzy msgid "Date sample file not found" -msgstr "Päiväystiedostoa ei löytynyt" +msgstr "PÄIVÄYS-TAI-TIED" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Korvataan tuntematon päiväysmuoto %2$s arvolla %1$s" -#: src/tar.c:1108 -#, fuzzy, c-format +#: src/tar.c:1140 +#, c-format msgid "Option %s: Treating date '%s' as %s" -msgstr "Valitsin %s: Käsittellään päiväys %s arvona %s" +msgstr "Valitsin %s: Käsittellään päiväys â€%s†arvona %s" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 -#, fuzzy, c-format +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 +#, c-format msgid "filter the archive through %s" -msgstr "ohjaa arkisto gzip-ohjelman läpi" +msgstr "ohjaa arkisto %s-ohjelman läpi" -#: src/tar.c:1179 -#, fuzzy +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" -msgstr "Kelvolliset argumentit --quoting-style -valitsimille ovat:" +msgstr "Kelvolliset argumentit --quoting-style-valitsimelle ovat:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2290,197 +2330,186 @@ msgstr "" "\n" "*Tämä* tar käyttää oletuksena:\n" -#: src/tar.c:1295 -#, fuzzy +#: src/tar.c:1330 msgid "Invalid owner or group ID" -msgstr "Virheellinen omistaja" +msgstr "Virheellinen omistaja- tai ryhmä-ID" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Virheellinen lohkomiskerroin" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "Virheellinen nauhan pituus" -#: src/tar.c:1466 +#: src/tar.c:1521 +#, fuzzy msgid "Invalid incremental level value" -msgstr "" +msgstr "virheellinen %%H-arvo" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "Annettu useampi kuin yksi kynnyspäiväys" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" -msgstr "" +msgstr "Virheellinen harvaversion arvo" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' ei ole tuettu tällä alustalla" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" -msgstr "" +msgstr "--checkpoint-arvo ei ole kokonaisluku" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Valitsimelle annettiin virheellinen tila" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "Virheellinen määrä" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Virheellinen tietueen koko" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "Tietueen koon on oltava %d:n monikerta." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "Virheellinen osien määrä" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" -msgstr "" +msgstr "Vain yksi --to-command-valitsin on sallittu" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "Kelvoton tiheysargumentti: %s" -#: src/tar.c:2133 -#, fuzzy, c-format +#: src/tar.c:2205 +#, c-format msgid "Unknown density: '%c'" msgstr "Tuntematon tiheys: â€%câ€" -#: src/tar.c:2150 -#, fuzzy, c-format +#: src/tar.c:2222 +#, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "*Tämä* tar ei tue valitsimia â€-[0-7][lmh]â€" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[TIEDOSTO]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 #, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "Valitsinta --%s ei voi käyttää yhdessä valitsimen %s kanssa" + +#: src/tar.c:2389 +#, c-format msgid "Old option '%c' requires an argument." msgstr "Vanha valitsin â€%c†vaatii argumentin." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "valitsin --occurence on merkityksetön ilman tiedostoluetteloa" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "valitsinta --occurence ei voi käyttää pyydetyssä toimintatilassa" - -#: src/tar.c:2408 -#, fuzzy +#: src/tar.c:2490 msgid "Multiple archive files require '-M' option" msgstr "Usean arkistotiedoston käyttäminen vaatii valitsimen â€-Mâ€" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "Valitsimia --listed-incremental ja --newer ei voi käyttää yhdessä" - -#: src/tar.c:2416 -#, fuzzy +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" -msgstr "valitsin --occurence on merkityksetön ilman tiedostoluetteloa" +msgstr "--level on merkityksetön ilman valitsinta --listed-incremental" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "%s: Arkiston osan nimiö on liian pitkä (raja on %lu tavu)" msgstr[1] "%s: Arkiston osan nimiö on liian pitkä (raja on %lu tavua)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Moniosaisia arkistoja ei voi tarkastaa" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Pakattuja arkistoja ei voi varmistaa" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "Hahmoa %s ei voi käyttää" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Pakattuja moniosaisia arkistoja ei voi käyttää" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "Pakattuja arkistoja ei voi liittää toisiinsa" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "Valitsinta --pax-option voi käyttää vain POSIX-arkistoille" -#: src/tar.c:2478 -#, fuzzy +#: src/tar.c:2560 msgid "--acls can be used only on POSIX archives" -msgstr "Valitsinta --pax-option voi käyttää vain POSIX-arkistoille" +msgstr "Valitsinta --acls voi käyttää vain POSIX-arkistoille" -#: src/tar.c:2483 -#, fuzzy +#: src/tar.c:2565 msgid "--selinux can be used only on POSIX archives" -msgstr "Valitsinta --pax-option voi käyttää vain POSIX-arkistoille" +msgstr "Valitsinta --selinux voi käyttää vain POSIX-arkistoille" -#: src/tar.c:2488 -#, fuzzy +#: src/tar.c:2570 msgid "--xattrs can be used only on POSIX archives" -msgstr "Valitsinta --pax-option voi käyttää vain POSIX-arkistoille" +msgstr "Valitsinta --xattrs voi käyttää vain POSIX-arkistoille" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "Hahmoa %s ei voi käyttää" - -#: src/tar.c:2525 -msgid "Volume length cannot be less than record size" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" msgstr "" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "" +#: src/tar.c:2630 +msgid "Volume length cannot be less than record size" +msgstr "Arkiston osan pituus ei voi olla pienempi kuin tietueen koko" -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "Kieltäydytään pelkurimaisesti luomasta tyhjää arkistoa" -#: src/tar.c:2565 -#, fuzzy +#: src/tar.c:2669 msgid "Options '-Aru' are incompatible with '-f -'" -msgstr "Valitsimet â€-Aru†eivät ole yhteensopivia valitsinten â€-f -†kanssa" +msgstr "Valitsimet â€-Aru†eivät ole yhteensopivia valitsimen â€-f -†kanssa" -#: src/tar.c:2660 -#, fuzzy +#: src/tar.c:2766 msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" -msgstr "Vähintään yhtä valitsimista â€-Acdtrux†on käytettävä" +msgstr "" +"Vähintään yhtä valitsimista â€-Acdtruxâ€, â€--delete†tai â€--test-label†on " +"käytettävä" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" @@ -2488,58 +2517,52 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: Tiedosto kutistui %s tavun verran" msgstr[1] "%s: Tiedosto kutistui %s tavun verran" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "Avainsana %s on tuntematon tai sillä ei vielä ole toteutusta" -#: src/xheader.c:173 -#, fuzzy +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" -msgstr "Aikaleima ei ole sallitulla välillä" +msgstr "Aikaleima on sallitun välin ulkopuolella" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "Hahmoa %s ei voi käyttää" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Avainsanaa %s ei voi ohittaa" -#: src/xheader.c:667 -#, fuzzy +#: src/xheader.c:668 msgid "Malformed extended header: missing length" -msgstr "Väärän muotoinen laajennettu otsake: yhtäsuuruusmerkki puuttuu" +msgstr "Väärän muotoinen lisäotsake: pituus puuttuu" -#: src/xheader.c:676 -#, fuzzy, c-format +#: src/xheader.c:677 +#, c-format msgid "Extended header length %*s is out of range" -msgstr "" -"Arkiston etumerkillinen base-64-merkkijono %s on sallitun %s-välin " -"ulkopuolella" +msgstr "Laajennettu otsake %*s on sallitun välin ulkopuolella" -#: src/xheader.c:688 -#, fuzzy +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" -msgstr "Väärän muotoinen laajennettu otsake: tyhje puuttuu pituuden jälkeen" +msgstr "Väärän muotoinen lisäotsake: tyhje puuttuu pituuden jälkeen" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" -msgstr "Väärän muotoinen laajennettu otsake: yhtäsuuruusmerkki puuttuu" +msgstr "Väärän muotoinen lisäotsake: yhtäsuuruusmerkki puuttuu" -#: src/xheader.c:702 -#, fuzzy +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" -msgstr "Väärän muotoinen laajennettu otsake: yhtäsuuruusmerkki puuttuu" +msgstr "Väärän muotoinen lisäotsake: rivinvaihto puuttuu" -#: src/xheader.c:740 +#: src/xheader.c:741 #, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" @@ -2547,55 +2570,54 @@ msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "Laajennettu otsake %s=%s on sallitun välin %s..%s ulkopuolella" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" -msgstr "Väärän muotoinen laajennettu otsake: virheellinen %s=%s" +msgstr "Väärän muotoinen lisäotsake: virheellinen %s=%s" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 -#, fuzzy, c-format +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 +#, c-format msgid "Malformed extended header: excess %s=%s" -msgstr "Väärän muotoinen laajennettu otsake: yhtäsuuruusmerkki puuttuu" +msgstr "Väärän muotoinen lisäotsake: ylimääräinen %s=%s" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" -msgstr "" -"Väärän muotoinen laajennettu otsake: virheellinen %s: odottamaton rajoitin %c" +msgstr "Väärän muotoinen lisäotsake: virheellinen %s: odottamaton rajoitin %c" -#: src/xheader.c:1511 -#, fuzzy, c-format +#: src/xheader.c:1512 +#, c-format msgid "Malformed extended header: invalid %s: odd number of values" -msgstr "Väärän muotoinen laajennettu otsake: yhtäsuuruusmerkki puuttuu" - -#: src/checkpoint.c:109 -#, fuzzy, c-format -msgid "%s: not a valid timeout" -msgstr "%s: Virheellinen ryhmä" +msgstr "Väärän muotoinen lisäotsake: virheellinen %s: pariton määrä arvoja" #: src/checkpoint.c:114 #, c-format +msgid "%s: not a valid timeout" +msgstr "%s ei ole kelvollinen aikakatkaisuarvo" + +#: src/checkpoint.c:121 +#, fuzzy, c-format msgid "%s: unknown checkpoint action" -msgstr "" +msgstr "tuntematon käyttäjä-ID: %s" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" -msgstr "" +msgstr "kirjoitus" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" -msgstr "" +msgstr "luku" #. TRANSLATORS: This is a "checkpoint of write operation", #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "Kirjoituksen tarkistuspiste %u" @@ -2604,7 +2626,7 @@ msgstr "Kirjoituksen tarkistuspiste %u" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "Lukemisen tarkistuspiste %u" @@ -2617,28 +2639,24 @@ msgid "" msgstr "Luo datatiedostot GNU tar:in testausta varten.\n" #: tests/genfile.c:127 -#, fuzzy msgid "File creation options:" -msgstr "Muut valitsimet:" +msgstr "Tiedoston luontivalinnat:" #: tests/genfile.c:128 tests/genfile.c:139 msgid "SIZE" -msgstr "" +msgstr "KOKO" #: tests/genfile.c:129 -#, fuzzy msgid "Create file of the given SIZE" -msgstr "luo annetun muotoinen arkisto." +msgstr "Luo annetun KOKOinen tiedosto" #: tests/genfile.c:131 -#, fuzzy msgid "Write to file NAME, instead of standard output" -msgstr "pura tiedostot vakiotulosteeseen" +msgstr "Kirjoita tuloste tiedostoon NIMI, ei vakiotulosteeseen" #: tests/genfile.c:133 -#, fuzzy msgid "Read file names from FILE" -msgstr "Luettiin %s tavua arkistosta %s" +msgstr "Lue tiedostonimet TIEDOSTOsta" #: tests/genfile.c:135 msgid "-T reads null-terminated names" @@ -2650,37 +2668,38 @@ msgstr "" #: tests/genfile.c:140 msgid "Size of a block for sparse file" -msgstr "" +msgstr "Harvan tiedoston lohkokoko" #: tests/genfile.c:142 +#, fuzzy msgid "Generate sparse file. Rest of the command line gives the file map." -msgstr "" +msgstr "Luo harva tiedosto. " #: tests/genfile.c:144 msgid "OFFSET" -msgstr "" +msgstr "SIIRTYMÄ" #: tests/genfile.c:145 -#, fuzzy msgid "Seek to the given offset before writing data" -msgstr "yritä varmistaa arkisto kirjoittamisen jälkeen" +msgstr "Siirry annettuun kohtaan ennen datan kirjoittamista" #: tests/genfile.c:151 msgid "File statistics options:" -msgstr "" +msgstr "Tiedostojen tilastoinnin valinnat:" #: tests/genfile.c:154 msgid "Print contents of struct stat for each given file. Default FORMAT is: " msgstr "" +"Tulosta struct statin sisältö jokaisesta annetusta tiedostosta. " +"OletusMUOTOILU on: " #: tests/genfile.c:161 msgid "Synchronous execution options:" -msgstr "" +msgstr "Synkronisen suorituksen valinnat:" #: tests/genfile.c:163 -#, fuzzy msgid "OPTION" -msgstr " [VALITSIN...]" +msgstr "VALITSIN" #: tests/genfile.c:164 msgid "" @@ -2694,23 +2713,27 @@ msgstr "" #: tests/genfile.c:170 msgid "Set date for next --touch option" -msgstr "" +msgstr "Aseta päiväys seuraavalle --touch-valitsimelle" #: tests/genfile.c:173 msgid "Display executed checkpoints and exit status of COMMAND" -msgstr "" +msgstr "Näytä suoritetut tarkistuspisteet sekä KOMENNOn paluuarvo" #: tests/genfile.c:178 msgid "" "Synchronous execution actions. These are executed when checkpoint number " "given by --checkpoint option is reached." msgstr "" +"Synkronisen suorituksen toiminnot. Nämä suoritetaan, kun saavutetaan --" +"checkpoint-valitsimella annettua numeroa vastaava tarkistuspiste." #: tests/genfile.c:181 msgid "" "Truncate FILE to the size specified by previous --length option (or 0, if it " "is not given)" msgstr "" +"Typistä TIEDOSTO aiemmalla --length-valitsimella määrättyyn kokoon (tai " +"nollaan, ellei annettu)" #: tests/genfile.c:185 msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option." @@ -2734,14 +2757,14 @@ msgid "Invalid size: %s" msgstr "Virheellinen koko: %s" #: tests/genfile.c:249 -#, fuzzy, c-format +#, c-format msgid "Number out of allowed range: %s" -msgstr "I-solmun numero ei ole sallitulla välillä" +msgstr "Lukuarvo sallitun välin ulkopuolella: %s" #: tests/genfile.c:252 -#, fuzzy, c-format +#, c-format msgid "Negative size: %s" -msgstr "Virheellinen koko: %s" +msgstr "Negatiivinen koko: %s" #: tests/genfile.c:265 tests/genfile.c:569 #, c-format @@ -2751,22 +2774,22 @@ msgstr "stat(%s) epäonnistui" #: tests/genfile.c:268 #, c-format msgid "requested file length %lu, actual %lu" -msgstr "" +msgstr "pyydetty tiedoston pituus %lu, todellinen %lu" #: tests/genfile.c:272 #, c-format msgid "created file is not sparse" -msgstr "" +msgstr "luotu tiedosto ei ole harva" #: tests/genfile.c:361 #, c-format msgid "Error parsing number near `%s'" -msgstr "" +msgstr "Virhe lukuarvon jäsentämisessä lähellä kohtaa â€%sâ€" #: tests/genfile.c:367 -#, fuzzy, c-format +#, c-format msgid "Unknown date format" -msgstr "Tuntematon järjestelmävirhe" +msgstr "Tuntematon päiväyksen muoto" #: tests/genfile.c:391 msgid "[ARGS...]" @@ -2776,12 +2799,11 @@ msgstr "[ARG...]" #: tests/genfile.c:673 tests/genfile.c:687 #, c-format msgid "cannot open `%s'" -msgstr "" +msgstr "tiedostoa â€%s†ei voi avata" #: tests/genfile.c:434 -#, fuzzy msgid "cannot seek" -msgstr "%s: Siirtyminen kohtaan %s ei onnistu" +msgstr "ei voi siirtyä" #: tests/genfile.c:451 #, c-format @@ -2792,6 +2814,7 @@ msgstr "tiedostonimi sisältää nollatavun" #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" +"harvoja tiedostoja ei voi luoda vakiotulosteeseen, käytä --file-valitsinta" #: tests/genfile.c:596 #, c-format @@ -2799,29 +2822,29 @@ msgid "incorrect mask (near `%s')" msgstr "" #: tests/genfile.c:602 tests/genfile.c:635 -#, fuzzy, c-format +#, c-format msgid "Unknown field `%s'" -msgstr " tuntematon tiedostotyyppi %s\n" +msgstr "Tuntematon kenttä â€%sâ€" #: tests/genfile.c:662 -#, fuzzy, c-format +#, c-format msgid "cannot set time on `%s'" -msgstr "%s: Siirtyminen kohtaan %s ei onnistu" +msgstr "tiedoston â€%s†aikaa ei voi asettaa" #: tests/genfile.c:692 -#, fuzzy, c-format +#, c-format msgid "cannot truncate `%s'" -msgstr "%s: Siirtyminen kohtaan %s ei onnistu" +msgstr "tiedostoa â€%s†ei voi typistää" #: tests/genfile.c:701 -#, fuzzy, c-format +#, c-format msgid "command failed: %s" -msgstr "Komento %s epäonnistui" +msgstr "komento epäonnistui: %s" #: tests/genfile.c:706 -#, fuzzy, c-format +#, c-format msgid "cannot unlink `%s'" -msgstr "%s: Siirtyminen kohtaan %s ei onnistu" +msgstr "tiedoston â€%s†linkitystä ei voi poistaa" #: tests/genfile.c:833 #, c-format @@ -2831,7 +2854,7 @@ msgstr "Komennon suoritus päättyi onnistuneesti\n" #: tests/genfile.c:835 #, fuzzy, c-format msgid "Command failed with status %d\n" -msgstr "Lapsiprosessi kuoli signaalilla %d" +msgstr "Komento keskeytyi signaaliin %d\n" #: tests/genfile.c:839 #, c-format @@ -2844,9 +2867,9 @@ msgid "Command stopped on signal %d\n" msgstr "Komento pysähtyi signaaliin %d\n" #: tests/genfile.c:844 -#, c-format +#, fuzzy, c-format msgid "Command dumped core\n" -msgstr "" +msgstr "Komennon suoritus päättyi onnistuneesti\n" #: tests/genfile.c:847 #, c-format @@ -2854,9 +2877,18 @@ msgid "Command terminated\n" msgstr "Komento keskeytyi\n" #: tests/genfile.c:879 -#, fuzzy, c-format +#, c-format msgid "--stat requires file names" -msgstr "--Sovitetut tiedostonimet--\n" +msgstr "--stat vaatii tiedostonimiä" + +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "Valitsinta --occurrence ei voi käyttää yhdessä valitsimen %s kanssa" + +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "Valitsimia --listed-incremental ja --newer ei voi käyttää yhdessä" + +#~ msgid "--verify cannot be used with %s" +#~ msgstr "Valitsinta --verify ei voi käyttää yhdessä valitsimen %s kanssa" #, fuzzy #~ msgid "Cannot get working directory" @@ -3036,9 +3068,6 @@ msgstr "--Sovitetut tiedostonimet--\n" #~ msgid "FILE-OF-NAMES" #~ msgstr "TIEDOSTO" -#~ msgid "exclude patterns are plain strings" -#~ msgstr "poisjättöhahmot ovat tavallisia merkkijonoja" - #~ msgid "dump instead the files symlinks point to" #~ msgstr "lisää symlinkin kohdetiedostot, ei linkkejä" @@ -3057,576 +3086,3 @@ msgstr "--Sovitetut tiedostonimet--\n" #~ msgstr "" #~ "Perustuu John Gilmoren ja Jay Fenlasonin tekemään työhön. Tarkka lista\n" #~ "tekijöistä on AUTHORS-tiedostossa.\n" - -# HUOM: Osoitetiedot suomennoksessa ajan tasalla, alkuperäisessä ei. -#~ msgid "" -#~ " GNU tar is free software; you can redistribute it and/or modify\n" -#~ " it under the terms of the GNU General Public License as published by\n" -#~ " the Free Software Foundation; either version 2 of the License, or\n" -#~ " (at your option) any later version.\n" -#~ "\n" -#~ " GNU tar is distributed in the hope that it will be useful,\n" -#~ " but WITHOUT ANY WARRANTY; without even the implied warranty of\n" -#~ " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" -#~ " GNU General Public License for more details.\n" -#~ "\n" -#~ " You should have received a copy of the GNU General Public License\n" -#~ " along with GNU tar; if not, write to the Free Software\n" -#~ " Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 " -#~ "USA\n" -#~ "\n" -#~ msgstr "" -#~ " GNU tar on vapaaohjelmisto; voitte levittää edelleen ja/tai muuttaa\n" -#~ " sitä Free Software Foundationin julkaiseman GNU General Public\n" -#~ " License'in ehtojen mukaisesti; joko version 2, tai (valintanne " -#~ "mukaan)\n" -#~ " minkä tahansa myöhemmän version.\n" -#~ "\n" -#~ " GNU taria levitetään siinä toivossa, että se olisi hyödyllinen,\n" -#~ " mutta TAKUUTA EI OLE; ei edes KAUPALLISESTI HYVÄKSYTTÄVÄSTÄ LAADUSTA\n" -#~ " tai SOPIVUUDESTA TIETTYYN TARKOITUKSEEN. Katsokaa lisätietoja GNU\n" -#~ " General Public License'istä.\n" -#~ "\n" -#~ " Olette saaneet kopion GNU General Public License'istä tämän\n" -#~ " ohjelman mukana. Ellette saaneet, kirjoittakaa Free Software " -#~ "Foundation,\n" -#~ " Inc.:ille osoitteeseen 51 Franklin Street, Fifth Floor,\n" -#~ " Boston, MA 02110-1301, USA.\n" -#~ "\n" - -#~ msgid "Semantics of -l option will change in the future releases." -#~ msgstr "Valitsimen -l merkitys muuttuu tulevissa versioissa." - -#~ msgid "Please use --one-file-system option instead." -#~ msgstr "Käytä valitsinta --one-file-system." - -#~ msgid "Warning: the -y option is not supported; perhaps you meant -j?" -#~ msgstr "Varoitus: valitsin -y ei ole tuettu, ehkä tarkoitit -j?" - -#~ msgid "Error in writing to standard output" -#~ msgstr "Virhe kirjoitettaessa vakiotulosteeseen" - -#~ msgid "" -#~ "GNU `tar' saves many files together into a single tape or disk archive, " -#~ "and\n" -#~ "can restore individual files from the archive.\n" -#~ msgstr "" -#~ "GNU â€tar†tallentaa useita tiedostoja yhteen nauha- tai levyarkistoon, " -#~ "sekä\n" -#~ "palauttaa yksittäisiä tiedostoja arkistosta.\n" - -#~ msgid "" -#~ "\n" -#~ "If a long option shows an argument as mandatory, then it is mandatory\n" -#~ "for the equivalent short option also. Similarly for optional arguments.\n" -#~ msgstr "" -#~ "\n" -#~ "Jos argumentti on pakollinen pitkän valitsimen kanssa, se on pakollinen\n" -#~ "myös vastaavan lyhyen valitsimen kanssa. Sama koskee valinnaisia " -#~ "argumentteja.\n" - -#~ msgid "" -#~ "\n" -#~ "Main operation mode:\n" -#~ " -t, --list list the contents of an archive\n" -#~ " -x, --extract, --get extract files from an archive\n" -#~ " -c, --create create a new archive\n" -#~ " -d, --diff, --compare find differences between archive and file " -#~ "system\n" -#~ " -r, --append append files to the end of an archive\n" -#~ " -u, --update only append files newer than copy in archive\n" -#~ " -A, --catenate append tar files to an archive\n" -#~ " --concatenate same as -A\n" -#~ " --delete delete from the archive (not on mag tapes!)\n" -#~ msgstr "" -#~ "\n" -#~ "Päätoimintatila:\n" -#~ " -t, --list listaa arkiston sisältö\n" -#~ " -x, --extract, --get pura tiedostoja arkistosta\n" -#~ " -c, --create luo uusi arkisto\n" -#~ " -d, --diff, --compare etsi erot arkiston ja tied.järjestelmän " -#~ "välillä\n" -#~ " -r, --append lisää tiedostoja arkiston loppuun\n" -#~ " -u, --update lisää vain arkistossa olevia uudemmat " -#~ "tiedostot\n" -#~ " -A, --catenate lisää tar-tiedostoja arkistoon\n" -#~ " --concatenate sama kuin -A\n" -#~ " --delete poista arkistosta (ei toimi nauhoilla!)\n" - -#~ msgid "" -#~ "\n" -#~ "Operation modifiers:\n" -#~ " -W, --verify attempt to verify the archive after writing " -#~ "it\n" -#~ " --remove-files remove files after adding them to the " -#~ "archive\n" -#~ " -k, --keep-old-files don't replace existing files when " -#~ "extracting\n" -#~ " --keep-newer-files don't replace existing files that are newer\n" -#~ " than their archive copies\n" -#~ " --overwrite overwrite existing files when extracting\n" -#~ " --no-overwrite-dir preserve metadata of existing directories\n" -#~ " -U, --unlink-first remove each file prior to extracting over " -#~ "it\n" -#~ " --recursive-unlink empty hierarchies prior to extracting " -#~ "directory\n" -#~ " -S, --sparse handle sparse files efficiently\n" -#~ " -O, --to-stdout extract files to standard output\n" -#~ " -G, --incremental handle old GNU-format incremental backup\n" -#~ " -g, --listed-incremental=FILE\n" -#~ " handle new GNU-format incremental backup\n" -#~ " --ignore-failed-read do not exit with nonzero on unreadable " -#~ "files\n" -#~ " --occurrence[=NUM] process only the NUMth occurrence of each " -#~ "file in\n" -#~ " the archive. This option is valid only in\n" -#~ " conjunction with one of the subcommands --" -#~ "delete,\n" -#~ " --diff, --extract or --list and when a list " -#~ "of\n" -#~ " files is given either on the command line " -#~ "or\n" -#~ " via -T option.\n" -#~ " NUM defaults to 1.\n" -#~ msgstr "" -#~ "\n" -#~ "Toimintovalinnat:\n" -#~ " -W, --verify yritä varmistaa arkisto kirjoittamisen " -#~ "jälkeen\n" -#~ " --remove-files poista tiedostot arkistoon lisäämisen " -#~ "jälkeen\n" -#~ " -k, --keep-old-files älä korvaa olemassaolevia tiedostoja " -#~ "purettaessa\n" -#~ " --keep-newer-files älä korvaa olemassaolevia tiedostoja, jotka " -#~ "ovat\n" -#~ " arkistokopioitaan uudempia\n" -#~ " --overwrite ylikirjoita olemassaolevat tiedostot " -#~ "purettaessa\n" -#~ " --overwrite-dir ylikirjoita hakemiston metadata purettaessa\n" -#~ " -U, --unlink-first poista jokainen tiedosto ennen sen päälle\n" -#~ " purkamista\n" -#~ " --recursive-unlink tyhjennä rakenne ennen hakemiston " -#~ "purkamista\n" -#~ " -S, --sparse käsittele harvat tiedostot tehokkaasti\n" -#~ " -O, --to-stdout pura tiedostot vakiotulosteeseen\n" -#~ " -G, --incremental käsittele vanha GNU-muotoinen lisääntyvä\n" -#~ " varmuuskopio\n" -#~ " -g, --listed-incremental=TIEDOSTO\n" -#~ " käsittele uusi GNU-muotoinen lisääntyvä\n" -#~ " varmuuskopio\n" -#~ " --ignore-failed-read jatka lukukelvottomista tiedostoista " -#~ "huolimatta\n" -#~ " --occurrence[=N] käsittele vain kunkin tiedoston N:s " -#~ "esiintymä\n" -#~ " arkistossa. Tämä valitsin on kelvollinen " -#~ "vain\n" -#~ " yhdessä alikomennon --delete, --diff, --" -#~ "extract\n" -#~ " tai --list, kun tiedostoluettelo on annettu\n" -#~ " komentoriviltä tai valitsimella -T.\n" -#~ " N on oletuksena 1.\n" - -#~ msgid "" -#~ "\n" -#~ "Handling of file attributes:\n" -#~ " --owner=NAME force NAME as owner for added files\n" -#~ " --group=NAME force NAME as group for added files\n" -#~ " --mode=CHANGES force (symbolic) mode CHANGES for added " -#~ "files\n" -#~ " --atime-preserve don't change access times on dumped files\n" -#~ " -m, --modification-time don't extract file modified time\n" -#~ " --same-owner try extracting files with the same " -#~ "ownership\n" -#~ " --no-same-owner extract files as yourself\n" -#~ " --numeric-owner always use numbers for user/group names\n" -#~ " -p, --same-permissions extract permissions information\n" -#~ " --no-same-permissions do not extract permissions information\n" -#~ " --preserve-permissions same as -p\n" -#~ " -s, --same-order sort names to extract to match archive\n" -#~ " --preserve-order same as -s\n" -#~ " --preserve same as both -p and -s\n" -#~ msgstr "" -#~ "\n" -#~ "Tiedostojen ominaisuuksien käsittely:\n" -#~ " --owner=NIMI pakota NIMI lisättyjen tiedostojen " -#~ "omistajaksi\n" -#~ " --group=NIMI pakota NIMI lisättyjen tiedostojen " -#~ "ryhmäksi\n" -#~ " --mode=MUUTOS pakota (symbolinen) tila MUUTOS " -#~ "lisätyille\n" -#~ " tiedostoille\n" -#~ " --atime-preserve älä muuta lisättyjen tiedostojen " -#~ "käyttöaikoja\n" -#~ " -m, --modification-time älä pura tiedoston muutosaikaa\n" -#~ " --same-owner yritä purkaa tiedostot samalla " -#~ "omistajuudella\n" -#~ " --no-same-owner pura tiedostot itsenäsi\n" -#~ " --numeric-owner käytä aina numeroita käyttäjän/ryhmän " -#~ "nimissä\n" -#~ " -p, --same-permissions pura tiedostojen oikeudet\n" -#~ " --no-same-permissions älä pura tiedostojen oikeuksia\n" -#~ " --preserve-permissions sama kuin -p\n" -#~ " -s, --same-order lajittele purettavat tiedostonimet " -#~ "vastaamaan\n" -#~ " arkistoa\n" -#~ " --preserve-order sama kuin -s\n" -#~ " --preserve sama kuin -p ja -s yhdessä\n" - -#~ msgid "" -#~ "\n" -#~ "Device selection and switching:\n" -#~ " -f, --file=ARCHIVE use archive file or device ARCHIVE\n" -#~ " --force-local archive file is local even if has a " -#~ "colon\n" -#~ " --rmt-command=COMMAND use given rmt COMMAND instead of /etc/" -#~ "rmt\n" -#~ " --rsh-command=COMMAND use remote COMMAND instead of rsh\n" -#~ " -[0-7][lmh] specify drive and density\n" -#~ " -M, --multi-volume create/list/extract multi-volume " -#~ "archive\n" -#~ " -L, --tape-length=NUM change tape after writing NUM x 1024 " -#~ "bytes\n" -#~ " -F, --info-script=FILE run script at end of each tape (implies -" -#~ "M)\n" -#~ " --new-volume-script=FILE same as -F FILE\n" -#~ " --volno-file=FILE use/update the volume number in FILE\n" -#~ msgstr "" -#~ "\n" -#~ "Laitteen valinta ja vaihtaminen:\n" -#~ " -f, --file=ARKISTO käytä arkistotiedostoa tai -laitetta " -#~ "ARKISTO\n" -#~ " --force-local arkisto on paikallinen vaikka nimessä " -#~ "olisi\n" -#~ " kaksoispiste\n" -#~ " --rmt-command=KOMENTO käytä KOMENTOA /etc/rmt:n sijaan\n" -#~ " --rsh-command=KOMENTO käytä KOMENTOa rsh:n sijaan\n" -#~ " -[0-7][lmh] anna asema ja tiheys\n" -#~ " -M, --multi-volume luo/listaa/pura moniosainen arkisto\n" -#~ " -L, --tape-length=MÄÄRÄ vaihda nauhaa MÄÄRÄ × 1024 kirjoitetun " -#~ "tavun\n" -#~ " jälkeen\n" -#~ " -F, --info-script=TIED aja skripti joka nauhan lopussa " -#~ "(valitsin -M\n" -#~ " tulee käyttöön)\n" -#~ " --new-volume-script=TIED sama kuin -F TIED\n" -#~ " --volno-file=TIED käytä/päivitä arkiston osan numero " -#~ "TIEDostossa\n" - -#~ msgid "" -#~ "\n" -#~ "Device blocking:\n" -#~ " -b, --blocking-factor=BLOCKS BLOCKS x 512 bytes per record\n" -#~ " --record-size=SIZE SIZE bytes per record, multiple of 512\n" -#~ " -i, --ignore-zeros ignore zeroed blocks in archive (means " -#~ "EOF)\n" -#~ " -B, --read-full-records reblock as we read (for 4.2BSD pipes)\n" -#~ msgstr "" -#~ "\n" -#~ "Laitteen lohkot:\n" -#~ " -b, --blocking-factor=LOHKOT LOHKOT × 512 tavua tietuetta kohti\n" -#~ " --record-size=MÄÄRÄ MÄÄRÄ tavua tietuetta kohti, 512:n " -#~ "monikerta\n" -#~ " -i, --ignore-zeros älä huomioi nollattuja lohkoja " -#~ "arkistossa\n" -#~ " (merkitsee tiedoston loppua)\n" -#~ " -B, --read-full-records suorita lohkominen uudelleen luettaessa\n" -#~ " (4.2BSD-putkia varten)\n" - -#~ msgid "" -#~ "\n" -#~ "Archive format selection:\n" -#~ " --format=FMTNAME create archive of the given format.\n" -#~ " FMTNAME is one of the following:\n" -#~ " v7 old V7 tar format\n" -#~ " oldgnu GNU format as per tar <= " -#~ "1.12\n" -#~ " gnu GNU tar 1.13 format\n" -#~ " ustar POSIX 1003.1-1988 (ustar) " -#~ "format\n" -#~ " posix POSIX 1003.1-2001 (pax) " -#~ "format\n" -#~ " --old-archive, --portability same as --format=v7\n" -#~ " --posix same as --format=posix\n" -#~ " --pax-option keyword[[:]=value][,keyword[[:]=value], ...]\n" -#~ " control pax keywords\n" -#~ " -V, --label=NAME create archive with volume name " -#~ "NAME\n" -#~ " PATTERN at list/extract time, a globbing " -#~ "PATTERN\n" -#~ " -j, --bzip2 filter the archive through bzip2\n" -#~ " -z, --gzip, --ungzip filter the archive through gzip\n" -#~ " -Z, --compress, --uncompress filter the archive through compress\n" -#~ " --use-compress-program=PROG filter through PROG (must accept -" -#~ "d)\n" -#~ msgstr "" -#~ "\n" -#~ "Arkistomuodon valinta:\n" -#~ " --format=MUOTO luo annetun muotoinen arkisto.\n" -#~ " MUOTO on jokin seuraavista:\n" -#~ " v7 vanha V7-tar-muoto\n" -#~ " oldgnu GNU-muoto tar-versioilla " -#~ "<= 1.12\n" -#~ " gnu GNU tar 1.13 -muoto\n" -#~ " ustar POSIX 1003.1-1988 (ustar) -" -#~ "muoto\n" -#~ " posix POSIX 1003.1-2001 (pax) -" -#~ "muoto\n" -#~ " --old-archive, --portability sama kuin --format=v7\n" -#~ " --posix sama kuin --format=posix\n" -#~ " -pax-option avainsana[[:]=arvo][,avainsana[[:]=arvo], ...]\n" -#~ " määrittele pax-avainsanoja\n" -#~ " -V, --label=NIMI luo arkisto nimiöllä NIMI\n" -#~ " HAHMO listattaessa/purettaessa jokeri-" -#~ "HAHMO\n" -#~ " -j, --bzip2 ohjaa arkisto bzip2-ohjelman läpi\n" -#~ " -z, --gzip, --ungzip ohjaa arkisto gzip-ohjelman läpi\n" -#~ " -Z, --compress, --uncompress ohjaa arkisto compress-ohjelman " -#~ "läpi\n" -#~ " --use-compress-program=OHJ ohjaa OHJelman läpi (on hyväksyttävä " -#~ "-d)\n" - -#~ msgid "" -#~ "\n" -#~ "Local file selection:\n" -#~ " -C, --directory=DIR change to directory DIR\n" -#~ " -T, --files-from=NAME get names to extract or create from file " -#~ "NAME\n" -#~ " --null -T reads null-terminated names, disable -" -#~ "C\n" -#~ " --exclude=PATTERN exclude files, given as a PATTERN\n" -#~ " -X, --exclude-from=FILE exclude patterns listed in FILE\n" -#~ " --anchored exclude patterns match file name start " -#~ "(default)\n" -#~ " --no-anchored exclude patterns match after any /\n" -#~ " --ignore-case exclusion ignores case\n" -#~ " --no-ignore-case exclusion is case sensitive (default)\n" -#~ " --wildcards exclude patterns use wildcards (default)\n" -#~ " --no-wildcards exclude patterns are plain strings\n" -#~ " --wildcards-match-slash exclude pattern wildcards match " -#~ "'/' (default)\n" -#~ " --no-wildcards-match-slash exclude pattern wildcards do not match " -#~ "'/'\n" -#~ " -P, --absolute-names don't strip leading `/'s from file names\n" -#~ " -h, --dereference dump instead the files symlinks point to\n" -#~ " --no-recursion avoid descending automatically in " -#~ "directories\n" -#~ " -l, --one-file-system stay in local file system when creating " -#~ "archive\n" -#~ " -K, --starting-file=NAME begin at file NAME in the archive\n" -#~ " --strip-path=NUM strip NUM leading components from file " -#~ "names\n" -#~ " before extraction\n" -#~ msgstr "" -#~ "\n" -#~ "Paikallisten tiedostojen valinta:\n" -#~ " -C, --directory=HAK siirry hakemistoon HAK\n" -#~ " -T, --files-from=TIEDOSTO hae purettavat/lisättävät nimet " -#~ "TIEDOSTOsta\n" -#~ " --null -T reads null-terminated names, disable -" -#~ "C\n" -#~ " --exclude=HAHMO jätä pois HAHMOn mukaiset tiedostot\n" -#~ " -X, --exclude-from=TIEDOSTO jätä pois TIEDOSTOssa listatut hahmot\n" -#~ " --anchored poisjättöhahmoja verrataan nimen alkuun " -#~ "(oletus)\n" -#~ " --no-anchored poisjättöhahmoja verrataan jokaisen â€/†" -#~ "jälkeen\n" -#~ " --ignore-case poisjättäminen ei huomioi kirjainkokoa\n" -#~ " --no-ignore-case poisjättäminen huomioi kirjainkoon " -#~ "(oletus)\n" -#~ " --wildcards poisjättöhahmot käyttävät jokerimerkkejä " -#~ "(oletus)\n" -#~ " --no-wildcards poisjättöhahmot ovat tavallisia " -#~ "merkkijonoja\n" -#~ " --wildcards-match-slash poisjättöhahmon jokerimerkit vastaavat " -#~ "merkkiä â€/â€\n" -#~ " --no-wildcards-match-slash poisjättöhahmon jokerimerkit eivät " -#~ "vastaa\n" -#~ " merkkiä â€/â€\n" -#~ " -P, --absolute-names älä poista merkkiä â€/†tiedostonimien " -#~ "alusta\n" -#~ " -h, --dereference lisää symlinkin kohdetiedostot, ei " -#~ "linkkejä\n" -#~ " --no-recursion estä automaattinen eteneminen " -#~ "alihakemistoihin\n" -#~ " -l, --one-file-system pysy nykyisessä tied.järjestelmässä " -#~ "arkistoa\n" -#~ " luotaessa\n" -#~ " -K, --starting-file=NIMI aloita arkiston tiedostosta NIMI\n" -#~ " --strip-path=MÄÄRÄ poista MÄÄRÄn verran osia tiedostonimien " -#~ "alusta\n" -#~ " ennen purkamista\n" - -#~ msgid "" -#~ " -N, --newer=DATE-OR-FILE only store files newer than DATE-OR-FILE\n" -#~ " --newer-mtime=DATE compare date and time when data changed " -#~ "only\n" -#~ " --after-date=DATE same as -N\n" -#~ msgstr "" -#~ " -N, --newer=PÄIVÄYS-TAI-TIED tallenna vain PÄIVÄYS-TAI-TIEDostoa " -#~ "uudemmat tiedostot\n" -#~ " --newer-mtime=PÄIVÄYS vertaa vain tiedoston muutosaikaa\n" -#~ " --after-date=PÄIVÄYS sama kuin -N\n" - -#~ msgid "" -#~ " --backup[=CONTROL] backup before removal, choose version " -#~ "control\n" -#~ " --suffix=SUFFIX backup before removal, override usual " -#~ "suffix\n" -#~ msgstr "" -#~ " --backup[=HALLINTA] varmuuskopiointi ennen poistoa, valitse\n" -#~ " versionhallinta\n" -#~ " --suffix=JÄLKILIITE varmuuskopiointi ennen poistoa, älä käytä\n" -#~ " tavanomaista jälkiliitettä\n" - -#~ msgid "" -#~ "\n" -#~ "Informative output:\n" -#~ " --help print this help, then exit\n" -#~ " --version print tar program version number, then exit\n" -#~ " -v, --verbose verbosely list files processed\n" -#~ " --checkpoint print directory names while reading the archive\n" -#~ " --check-links print a message if not all links are dumped\n" -#~ " --totals print total bytes written while creating archive\n" -#~ " --index-file=FILE send verbose output to FILE\n" -#~ " --utc print file modification dates in UTC\n" -#~ " -R, --block-number show block number within archive with each " -#~ "message\n" -#~ " -w, --interactive ask for confirmation for every action\n" -#~ " --confirmation same as -w\n" -#~ msgstr "" -#~ "\n" -#~ "Tietoja antava tuloste:\n" -#~ " --help näytä tämä ohje ja poistu\n" -#~ " --version näytä tar-ohjelman versionumero ja poistu\n" -#~ " -v, --verbose listaa käsiteltävät tiedostot\n" -#~ " --checkpoint näytä hakemistojen nimet luettaessa arkistoa\n" -#~ " --check-links näytä viesti, ellei kaikkia linkkejä lisätty\n" -#~ " --totals näytä kirj. tavujen yhteismäärä luotaessa " -#~ "arkistoa\n" -#~ " --index-file=TIED ohjaa monisanainen tuloste TIEDostoon\n" -#~ " --utc näytä tiedostojen muutosajat UTC-aikoina\n" -#~ " -R, --block-number näytä lohkonumero arkistossa viestien yhteydessä\n" -#~ " -w, --interactive kysy varmistusta jokaiselle toiminnolle\n" -#~ " --confirmation sama kuin -w\n" - -#~ msgid "" -#~ "\n" -#~ "Compatibility options:\n" -#~ " -o when creating, same as --old-" -#~ "archive\n" -#~ " when extracting, same as --no-same-" -#~ "owner\n" -#~ msgstr "" -#~ "\n" -#~ "Yhteensopivuusvalitsimet:\n" -#~ " -o luotaessa sama kuin --old-archive\n" -#~ " purettaessa sama kuin --no-same-" -#~ "owner\n" - -#~ msgid "" -#~ "\n" -#~ "ARCHIVE may be FILE, HOST:FILE or USER@HOST:FILE; DATE may be a textual " -#~ "date\n" -#~ "or a file name starting with `/' or `.', in which case the file's date is " -#~ "used.\n" -#~ "*This* `tar' defaults to `--format=%s -f%s -b%d'.\n" -#~ msgstr "" -#~ "\n" -#~ "ARKISTO voi olla TIEDOSTO, ISÄNTÄ:TIEDOSTO tai KÄYTTÄJÄ@ISÄNTÄ:TIEDOSTO;\n" -#~ "PÄIVÄYS voi olla tekstimuotoinen, tai merkillä â€/†tai â€.†alkava\n" -#~ "tiedoston nimi, jolloin käytetään tiedoston päiväystä.\n" -#~ "*Tämä* â€tar†käyttää oletuksena â€--format=%s -f %s -b%dâ€.\n" - -#~ msgid "Written by John Gilmore and Jay Fenlason." -#~ msgstr "Kirjoittaneet John Gilmore ja Jay Fenlason." - -#~ msgid "Cannot close" -#~ msgstr "Ei voi sulkea" - -#~ msgid "Cannot dup" -#~ msgstr "Tiedostokahvaa ei voi kopioida" - -#~ msgid "Cannot use compressed or remote archives" -#~ msgstr "Pakattuja tai etäarkistoja ei voi käyttää" - -#~ msgid "tar (child)" -#~ msgstr "tar (lapsiprosessi)" - -#~ msgid "tar (grandchild)" -#~ msgstr "tar (lapsenlapsiprosessi)" - -#~ msgid "Child returned status %d" -#~ msgstr "Lapsiprosessi palautti tilan %d" - -#~ msgid "Member names contain `..'" -#~ msgstr "Tiedostonimet sisältävät â€..â€" - -#~ msgid "%s: Member name contains `..'" -#~ msgstr "%s: Tiedostonimi sisältää â€..â€" - -#~ msgid "" -#~ "\n" -#~ "Archive format selection:\n" -#~ " -V, --label=NAME create archive with volume name " -#~ "NAME\n" -#~ " PATTERN at list/extract time, a globbing " -#~ "PATTERN\n" -#~ " -o, --old-archive, --portability write a V7 format archive\n" -#~ " --posix write a POSIX format archive\n" -#~ " -j, --bzip2 filter the archive through bzip2\n" -#~ " -z, --gzip, --ungzip filter the archive through gzip\n" -#~ " -Z, --compress, --uncompress filter the archive through compress\n" -#~ " --use-compress-program=PROG filter through PROG (must accept -" -#~ "d)\n" -#~ msgstr "" -#~ "\n" -#~ "Arkiston muodon valinta:\n" -#~ " -V, --label=NIMI luo arkisto nimiöllä NIMI\n" -#~ " HAHMO listattaessa/purettaessa jokeri-" -#~ "HAHMO\n" -#~ " -o, --old-archive, --portability kirjoita V7-muodon arkisto\n" -#~ " --posix kirjoita POSIX-muotoinen arkisto\n" -#~ " -j, --bzip2 ohjaa arkisto bzip2-ohjelman läpi\n" -#~ " -z, --gzip, --ungzip ohjaa arkisto gzip-ohjelman läpi\n" -#~ " -Z, --compress, --uncompress ohjaa arkisto compress-ohjelman " -#~ "läpi\n" -#~ " --use-compress-program=OHJ ohjaa OHJelman läpi (on hyväksyttävä " -#~ "-d)\n" - -#~ msgid "Obsolete option, now implied by --blocking-factor" -#~ msgstr "Vanhentunut valitsin, seuraa nyt valitsimesta --blocking-factor" - -#~ msgid "Obsolete option name replaced by --blocking-factor" -#~ msgstr "Vanhentunut valitsimen nimi, uusi on --blocking-factor" - -#~ msgid "Obsolete option name replaced by --read-full-records" -#~ msgstr "Vanhentunut valitsimen nimi, uusi on --read-full-records" - -#~ msgid "Obsolete option name replaced by --touch" -#~ msgstr "Vanhentunut valitsimen nimi, uusi on --touch" - -#~ msgid "Obsolete option name replaced by --absolute-names" -#~ msgstr "Vanhentunut valitsimen nimi, uusi on --absolute-names" - -#~ msgid "Obsolete option name replaced by --block-number" -#~ msgstr "Vanhentunut valitsimen nimi, uusi on --block-number" - -#~ msgid "Obsolete option name replaced by --backup" -#~ msgstr "Vanhentunut valitsimen nimi, uusi on --backup" - -#~ msgid "" -#~ "If a long option shows an argument as mandatory, then it is mandatory\n" -#~ "for the equivalent short option also.\n" -#~ "\n" -#~ " -l, --file-length=LENGTH LENGTH of generated file\n" -#~ " -p, --pattern=PATTERN PATTERN is `default' or `zeros'\n" -#~ " --help display this help and exit\n" -#~ " --version output version information and exit\n" -#~ msgstr "" -#~ "Jos argumentti on pakollinen pitkän valitsimen kanssa, se on pakollinen\n" -#~ "myös vastaavan lyhyen valitsimen kanssa.\n" -#~ "\n" -#~ " -l, --file-length=PITUUS luotavan tiedoston PITUUS\n" -#~ " -p, --pattern=HAHMO HAHMO on â€default†tai â€zerosâ€\n" -#~ " --help näytä tämä ohje ja poistu\n" -#~ " --version näytä versiotiedot ja poistu\n" diff --git a/po/fr.gmo b/po/fr.gmo index 27e98dd..409bcfe 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 30ebb3a..f632dcb 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,12 +4,12 @@ # Michel Robitaille , jusqu'en 2004 # Christophe Combelles , 2007, 2008, 2009, 2010, 2011 # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" "Project-Id-Version: tar-1.26\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" "PO-Revision-Date: 2011-03-13 12:51+0100\n" "Last-Translator: Christophe Combelles \n" "Language-Team: French \n" @@ -100,7 +100,7 @@ msgstr "Afficher cette aide-mémoire" msgid "give a short usage message" msgstr "Afficher un court mode d'emploi" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "NOM" @@ -436,7 +436,7 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s : %s impossible" @@ -445,34 +445,34 @@ msgstr "%s : %s impossible" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s : AVERTISSEMENT : %s impossible" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s : le mode ne peut pas être changé en %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s : le propriétaire ne peut pas être changé en uid %lu, gid %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s : impossible de créer un lien physique vers %s" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s : erreur de lecture à l'octet %s, à la lecture de %lu octet" msgstr[1] "%s: erreur de lecture à l'octet %s, à la lecture de %lu octets" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" @@ -483,22 +483,22 @@ msgstr[1] "" "%s: AVERTISSEMENT : erreur de lecture à l'octet %s, à la lecture de %lu " "octets" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s : Positionnement à %s impossible" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s : AVERTISSEMENT : positionnement à %s impossible" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s : un lien symbolique ne peut pas être créé vers %s" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -599,8 +599,8 @@ msgstr "" "Manipule un lecteur de cartouches en acceptant des commandes d'un processus " "distant" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "NOMBRE" @@ -608,10 +608,10 @@ msgstr "NOMBRE" msgid "set debug level" msgstr "définit le niveau de débogage" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "FICHIER" @@ -633,108 +633,116 @@ msgstr "trop d'arguments" msgid "Garbage command" msgstr "Commande rejetée" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Ceci ne ressemble pas à une archive de type « tar »" -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" -msgstr "Nombre total d'octets écrits" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" msgstr "Nombre total d'octets lus" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "Nombre total d'octets écrits" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Nombre total d'octets effacés : %s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(tube)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "Valeur incorrecte pour « record_size »" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Aucun nom d'archive donné" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "" "Une archive utilisant l'entrée/sortie standard ne peut pas être vérifiée" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "L'archive est compressée. Utilisez l'option %s" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Une archive compressée ne peut pas être mise à jour" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "Début de la cartouche atteinte ; arrêt du programme." -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "Trop d'erreurs, arrêt du programme." -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Taille de l'enregistrement = %lu bloc" msgstr[1] "Taille de l'enregistrement = %lu blocs" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "Bloc non aligné (%lu octet) dans l'archive" msgstr[1] "Bloc non aligné (%lu octets) dans l'archive" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" "Impossible de reculer dans le fichier d'archive ; il se peut qu'il soit " "illisible sans l'option « -i »" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek ne s'est pas arrêté à une limite d'enregistrement" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s : contient un numéro de volume non valable" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "Débordement du numéro de volume" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Préparez le volume n°%d pour %s et appuyez sur Entrée : " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "" "Fin de fichier rencontrée alors qu'une réponse de l'utilisateur était " "attendue" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "AVERTISSEMENT : l'archive est incomplète" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -745,67 +753,67 @@ msgstr "" " q Arrêter tar\n" " y ou newline Continuer le traitement\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Générer un sous-shell\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? Afficher cette liste\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Pas de nouveau volume ; fin du traitement.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "Nom de fichier non spécifié. Essaye encore :).\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Données non valables en entrée. Tapez « ? » pour obtenir de l'aide.\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "Échec de la commande %s" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" "La suite de %s est probablement sur ce volume : l'en-tête contient un nom " "tronqué." -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "La suite de %s n'est pas sur ce volume." -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s a une taille incorrecte (%s != %s + %s)." -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Ce volume est hors séquence (%s - %s != %s)" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "Archive non étiquetée pour correspondre à %s." -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "Le volume %s ne correspond pas à %s." -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -813,7 +821,7 @@ msgstr "" "%s : nom de fichier tronqué, car trop long pour être stocké dans un en-tête " "GNU multi-volumes" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "l'écriture ne s'est pas arrêté sur une limite de bloc" @@ -824,16 +832,16 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Seulement %lu octet sur %lu a pu être lu" msgstr[1] "Seulement %lu octets sur %lu ont pu être lus" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "Les contenus sont différents." -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "Fin prématurée rencontrée dans l'archive." -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "Le type de fichier est différent." @@ -853,7 +861,7 @@ msgstr "Le GID est différent." msgid "Mod time differs" msgstr "La date de modification est différente." -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "La taille est différente." @@ -870,39 +878,39 @@ msgstr "Le lien symbolique est différent." msgid "Device number differs" msgstr "Le numéro de périphérique est différent." -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Vérification " -#: src/compare.c:471 +#: src/compare.c:473 #, fuzzy, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "" "%s : type de fichier inconnu « %c », recherche de différence comme pour un " "fichier normal" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "L'archive contient des noms de fichiers dont le préfixe a été enlevé" -#: src/compare.c:533 +#: src/compare.c:535 msgid "Archive contains transformed file names." msgstr "L'archive contient des noms de fichiers transformés" -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "" "La vérification peut échouer lors de la localisation des fichier originaux." -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "ÉCHEC DE VÉRIFICATION : %d en-tête non valable détecté." msgstr[1] "ÉCHEC DE VÉRIFICATION : %d en-têtes non valables détectés." -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "Bloc zéro solitaire repéré à %s" @@ -950,57 +958,57 @@ msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "%s : fichier réduit de %s octet ; remplissage avec des zéros" msgstr[1] "%s : fichier réduit de %s octets ; remplissage avec des zéros" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "" "%s : le fichier est sur un système de fichiers différent ; fichier non " "archivé" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "contenu non archivé" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s : type de fichier inconnu ; fichier ignoré" -#: src/create.c:1549 +#: src/create.c:1551 #, c-format msgid "Missing links to %s." msgstr "Liens manquants vers %s." -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s : le fichier n'est pas modifié ; fichier non archivé" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s : le fichier est l'archive elle-même ; fichier non archivé" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "répertoire non archivé" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s : fichier modifié pendant sa lecture" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s : socket ignorée" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s : porte ignorée" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "On saute à l'en-tête suivant" @@ -1046,7 +1054,7 @@ msgstr "Tentative d'extraction des liens symboliques comme des liens physiques" msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s : extraction impossible (morceau de fichier issu d'un autre volume)" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" msgstr "En-tête à nom long inattendu" @@ -1092,157 +1100,157 @@ msgstr "" msgid "%s: Directory has been renamed" msgstr "%s : le répertoire a été renommé." -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "Horodatage non valable" -#: src/incremen.c:1045 +#: src/incremen.c:1047 #, fuzzy msgid "Invalid modification time" msgstr "Temps de modification non valable (secondes)" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "Temps de modification non valable (nanosecondes)" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "Numéro de périphérique non valable" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Numéro d'inode non valable" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" msgstr "" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" msgstr "Fin prématurée du fichier d'instantané" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" msgstr "" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" msgstr "" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "Terminaison de champ manquante" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "Mauvais format de fichier incrémental" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "Version non prise en charge pour le format incrémental : %" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "dumpdir incorrect : « %c » était attendu mais %#3o a été trouvé" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "dumpdir incorrect : « X » en double" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "dumpdir incorrect : nom vide dans « R »" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "dumpdir incorrect : « T » non précédé de « R »" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "dumpdir incorrect : nom vide dans « T »" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "dumpdir incorrect : fin des données trouvées au lieu de « %c »" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "dumpdir incorrect : « X » n'a jamais été utilisé" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Impossible de créer un répertoire temporaire utilisant le modèle %s" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s : répertoire non purgé : impossible d'évaluer par stat()" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "" "%s : le répertoire est sur un autre périphérique : répertoire non purgé" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s : suppression de %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s : suppression impossible" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s : omis" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "bloc %s : ** Bloc de NULs **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "bloc %s : ** Fin de fichier **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "bloc %s : " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "" "Blancs dans l'en-tête alors qu'une valeur numérique de type %s était attendue" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1250,27 +1258,27 @@ msgstr "" "complément à 2 supposé" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "La valeur octale de l'archive %.*s est en dehors de la plage de %s" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "L'archive contient des en-têtes obsolètes en base 64." -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Une chaîne en base 64 signée %s de l'archive est hors de la plage %s" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Une valeur en base 256 de l'archive est en dehors de la plage %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "" @@ -1278,70 +1286,70 @@ msgstr "" "attendue." #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "La valeur de l'archive %s est hors des limites de %s : %s..%s" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " lien vers %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " type de fichier inconnu %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--Lien long--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--Nom long--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--En-tête de volume--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Suite à l'octet %s--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Création du répertoire :" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "%s renommé en %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s : impossible de renommer en %s" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "%s finalement renommé en %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s : fichier supprimé avant d'avoir été lu" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "processus enfant" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "canal inter-processus" @@ -1355,7 +1363,7 @@ msgstr "Échec de la commande %s" msgid "%s: file list requested from %s already read from %s" msgstr "%s : la liste de fichiers est déjà lue" -#: src/names.c:448 +#: src/names.c:448 src/checkpoint.c:274 #, fuzzy, c-format msgid "cannot split string '%s': %s" msgstr "Impossible de définir la date de « %s »" @@ -1365,12 +1373,12 @@ msgstr "Impossible de définir la date de « %s »" msgid "%s: file name read contains nul character" msgstr "%s : le nom de fichier lu contient un caractère nul" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "" "Caractères de correspondance de motif utilisé dans les noms de fichiers." -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1378,49 +1386,49 @@ msgstr "" "Utilisez « --wildcards » pour activer la correspondance de motif ou « --no-" "wildcards » pour supprimer cet avertissement" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s : non trouvé dans l'archive" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s : occurence requise non trouvée dans l'archive" -#: src/names.c:876 +#: src/names.c:879 #, c-format msgid "Archive label mismatch" msgstr "Mauvaise correspondance d'étiquette d'archive" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "L'utilisation de l'option -C à l'intérieur de la liste de fichiers n'est pas " "permise avec --listed-incremental" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Une seule option -C est autorisée avec --listed-incremental" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "" "Les options « -%s » et« -%s » nécessitent toutes les deux l'entrée standard." -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s : format d'archive non valable" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "" "Fonctionnalités de type GNU demandées pour un format d'archive incompatible." -#: src/tar.c:255 +#: src/tar.c:264 #, fuzzy, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." @@ -1428,7 +1436,7 @@ msgstr "" "Type de protection de caractères inconnu « %s ». Essayez « %s --quoting-" "style=help » pour avoir une liste." -#: src/tar.c:364 +#: src/tar.c:378 #, fuzzy msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " @@ -1450,7 +1458,7 @@ msgstr "" "manière détaillée.\n" " tar -xf archive.tar # Extrait tous les fichiers de archive.tar.\n" -#: src/tar.c:373 +#: src/tar.c:387 #, fuzzy msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1472,84 +1480,84 @@ msgstr "" " nil, existing Numérotées si déjà numérotées, sinon simples.\n" " never, simple Faire toujours des sauvegardes simples.\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "Mode d'opération principal :" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "Afficher le contenu de l'archive" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "Extraire les fichiers de l'archive" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "Créer une nouvelle archive" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "Trouver les différences entre l'archive et le système de fichiers" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "Ajouter des fichiers à la fin de l'archive" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "" "Ajouter seulement les fichiers plus récents que les copies présentes dans " "l'archive" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "Ajouter des fichiers tar à une archive" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "Effacer de l'archive (pas sur les bandes magnétiques !)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "Tester l'étiquette du volume d'archive et terminer" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "Modificateurs d'opération :" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "" "Économiser efficacement l'espace dans les fichiers dispersés (fichiers à " "trous)" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "MAJEUR[.MINEUR]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" "Définir la version du format de dispersion à utiliser (implique « --sparse »)" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "Prendre en charge les sauvegardes incrémentales à l'ancien format GNU" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "Prendre en charge les sauvegardes incrémentales au nouveau format GNU" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "niveau de vidage d'archive incrémentale au nouveau format GNU" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "Ne pas s'arrêter à cause des non-zéros sur les fichiers illisibles" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1562,141 +1570,149 @@ msgstr "" "fichiers est fournie soit sur la ligne de commande, soit avec l'option « -T " "». NOMBRE vaut 1 par défaut." -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "L'archive peut être parcourue" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "L'archive ne peut pas être parcourue" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "" "Ne pas vérifier les numéros de périphériques lors de la création d'archives " "incrémentales" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" "vérifier les numéros de périphériques lors de la création d'archives " "incrémentales (par défaut)" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "Contrôle de l'écrasement :" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "Tenter de vérifier l'archive après écriture" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "Supprimer les fichiers après les avoir ajoutés à l'archive" -#: src/tar.c:471 +#: src/tar.c:485 #, fuzzy msgid "don't replace existing files when extracting, treat them as errors" msgstr "Ne pas écraser les fichiers préexistants lors de l'extraction" -#: src/tar.c:474 +#: src/tar.c:488 #, fuzzy msgid "don't replace existing files when extracting, silently skip over them" msgstr "Ne pas écraser les fichiers préexistants lors de l'extraction" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "" "Ne pas écraser les fichier préexistants qui sont plus récents que leur copie " "dans l'archive" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "Écraser les fichiers préexistants lors de l'extraction" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "Effacer chaque fichier préexistant avant l'extraction" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "Vider les hiérarchies avant d'extraire les répertoires" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "Préserver les métadonnées des répertoires préexistants" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "Écraser les métadonnées des répertoires préexistants lors de l'extraction " "(comportement par défaut)" -#: src/tar.c:490 +#: src/tar.c:504 #, fuzzy msgid "preserve existing symlinks to directories when extracting" msgstr "Écraser les fichiers préexistants lors de l'extraction" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "RÉP" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "Choix du flux de sortie :" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "Extraire les fichiers vers la sortie standard" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "COMMANDE" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "Renvoyer par tube les fichiers extraits vers un autre programme" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "Ignorer les codes de retour des processus enfants" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "" "Traiter les codes de retours non nuls des processus enfants comme des erreurs" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Traitement des attributs de fichiers :" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "Utiliser NOM comme propriétaire des fichiers ajoutés" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "Utiliser NOM comme groupe des fichiers ajoutés" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "DATE-OU-FICHIER" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" "Définir la date de modification des fichiers ajoutés avec DATE-OU-FICHIER" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "CHANGEMENTS" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "" "Utiliser les CHANGEMENTS de mode (symboliques) pour les fichiers ajoutés" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "MÉTHODE" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " @@ -1706,11 +1722,11 @@ msgstr "" "lecture (MÉTHODE = « replace » par défaut) ou en ne définissant pas les " "dates initialement (MÉTHODE = « system »)" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "Ne pas extraire la date de modification du fichier" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" @@ -1718,23 +1734,23 @@ msgstr "" "essayer d'extraire les fichiers avec le même propriétaire que dans l'archive " "(par défaut pour le superutilisateur)" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "" "S'approprier les fichiers lors de l'extraction (par défaut pour les " "utilisateurs ordinaires)" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "Toujours utiliser les valeurs numériques des utilisateurs/groupes" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" "Extraire les informations de permissions sur les fichiers (par défaut pour " "le superutilisateur)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1742,16 +1758,16 @@ msgstr "" "Appliquer l'umask de l'utilisateur lors de l'extraction des permissions (par " "défaut pour les utilisateurs normaux)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "Équivalent à « -p -s » à la fois" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1759,180 +1775,188 @@ msgstr "" "Reporter à la fin de l'extraction le changement des dates de modification et " "des permissions des répertoires extraits" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "Annule l'effet de l'option « --delay-directory-restore »" -#: src/tar.c:554 +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 #, fuzzy msgid "Handling of extended file attributes:" msgstr "Traitement des attributs de fichiers :" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" msgstr "" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" msgstr "" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" msgstr "" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" msgstr "" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" msgstr "" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" msgstr "" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" msgstr "" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" msgstr "" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "Sélection et option de périphérique :" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ARCHIVE" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "Utiliser le fichier ou le périphérique ARCHIVE" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "Le fichier d'archive est local même si « : » a été spécifié" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "Utiliser la COMMANDE rmt fournie au lieu de rmt" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "Utiliser la COMMANDE distante à la place de rsh" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "Spécifier le lecteur et la densité" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "Créer/lister/extraire une archive multi-volumes" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "Changer de cartouche après avoir écrit NOMBRE x 1024 octets" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "Exécuter le script à la fin de chaque cartouche (implique « -M »)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "Utiliser/mettre à jour le numéro de volume dans le FICHIER" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "Blocs du périphérique :" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "BLOCS" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "BLOCS x 512 octets par enregistrement" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "NOMBRE d'octets par enregistrement (multiple de 512)" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "Ignorer les blocs de zéros dans l'archive (càd EOF)" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "Refaire les blocs pendant la lecture (pour les tubes BSD 4.2)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "Sélection du format d'archive :" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "FORMAT" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "Créer l'archive au format désiré." -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "FORMAT peut prendre une des valeurs suivantes :" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "Vieux format tar V7" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "Format GNU issu de tar <= 1.12" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "Format GNU tar 1.13.x" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "Format POSIX 1003.1-1988 (ustar)" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "Format POSIX 1003.1-2001 (pax)" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "Identique à pax" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "Identique à « --format=v7 »" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "Identique à « --format=posix »" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "mot_clé[[:]=valeur][,mot_clé[[:]=valeur]..." -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "Mots-clés de contrôle pax" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "TEXTE" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1941,85 +1965,83 @@ msgstr "" "l'extraction, utiliser le TEXTE comme motif de correspondance (glob) au nom " "de volume." -#: src/tar.c:660 +#: src/tar.c:684 msgid "Compression options:" msgstr "Options de compression :" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "" "Utiliser le suffixe de l'archive pour déterminer le programme de compression" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "" "Ne pas utiliser l'extension du fichier d'archive pour déterminer le " "programme de compression" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "PROG" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "Filtrer à travers le PROG (doit accepter l'option « -d »)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "Sélection des fichiers locaux :" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" "Ajouter le FICHIER donné à l'archive (utile si son nom commence par un tiret)" -#: src/tar.c:687 -msgid "DIR" -msgstr "RÉP" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "Utiliser RÉP comme répertoire de travail" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "Lire depuis le FICHIER la liste des noms à extraire ou à créer" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "" "« -T » permet de lire les noms terminés par un NULL et désactive l'option « -" "C »" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "désactive l'effet de l'option --null précédente" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" msgstr "" "Enlever la protection de caractères des noms de fichiers lus avec « -T " "» (par défaut)" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" msgstr "" "Ne pas enlever la protection de caractères des noms de fichiers lus avec « -" "T »" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "MOTIF" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "Exclure les fichiers correspondant au MOTIF" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "Exclure les motifs listés dans le FICHIER" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -2027,101 +2049,115 @@ msgstr "" "Exclure le contenu des répertoires contenant CACHEDIR.TAG, sauf le fichier " "de tag lui-même" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "Tout exclure dans les répertoires contenant CACHEDIR.TAG" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "Exclure les répertoires contenant CACHEDIR.TAG" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" "Exclure le contenu des répertoires contenant le FICHIER, sauf le FICHIER lui-" "même" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "Tout exclure dans les répertoires contenant le FICHIER" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "Exclure les répertoires contenant le FICHIER" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "Exclure les répertoires de contrôle de version (CVS, .svn, etc.)" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "exclure les fichiers de sauvegarde et de verrou" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "Empêcher la descente automatique dans les sous-répertoires" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "" "Rester dans le système de fichiers local lors de la création de l'archive" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "Parcourir les sous-répertoires de manière récursive (par défaut)" -#: src/tar.c:729 +#: src/tar.c:761 #, fuzzy msgid "don't strip leading '/'s from file names" msgstr "Ne pas enlever le « / » au début des noms de fichiers" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "" "Suivre les liens symboliques ; archiver les fichiers vers lesquels ils " "pointent" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "" "Suivre les liens physiques : archiver les fichiers vers lesquels ils pointent" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "NOM-DE-MEMBRE" -#: src/tar.c:735 +#: src/tar.c:767 #, fuzzy msgid "begin at member MEMBER-NAME when reading the archive" msgstr "Débuter au NOM-DE-MEMBRE dans l'archive" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "Stocker seulement les fichiers plus récents que DATE-OU-FICHIER" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "DATE" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "Ne comparer que la date et l'heure de modification des données" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "CONTRÔLE" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "" "Faire une copie de sauvegarde avant suppression, choisir le CONTRÔLE de " "version" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "CHAÃŽNE" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -2130,111 +2166,111 @@ msgstr "" "habituel (« ~ » sauf s'il est définit par la variable d'environnement " "SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "Transformation des noms de fichiers :" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "" "Supprimer NOMBRE composants au début des noms de fichiers à l'extraction" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "EXPRESSION" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "" "Utiliser l'EXPRESSION de remplacement « sed » pour transformer les noms de " "fichiers" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "Options de correspondance de noms de fichiers (pour les motifs d'exclusion " "et d'inclusion)" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "Ignorer la casse (majuscules/minuscules)" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "Les motifs doivent correspondre au début des noms de fichiers" -#: src/tar.c:767 +#: src/tar.c:799 #, fuzzy msgid "patterns match after any '/' (default for exclusion)" msgstr "" "Les motifs peuvent correspondre après n'importe quel « / » (par défaut pour " "l'exclusion)" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "Correspondance sensible à la casse (comportement par défaut)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "" "Utiliser des caractères de correspondance (par défaut pour l'exclusion)" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "Correspondance exacte de chaîne" -#: src/tar.c:775 +#: src/tar.c:807 #, fuzzy msgid "wildcards do not match '/'" msgstr "« / » ne correspond à aucun caractère de correspondance" -#: src/tar.c:777 +#: src/tar.c:809 #, fuzzy msgid "wildcards match '/' (default for exclusion)" msgstr "" "« / » peut correspondre à un caractère de correspondance (par défaut pour " "l'exclusion)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Options d'affichage :" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "Afficher de manière détaillée les fichiers traités" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "MOTCLÉ" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "Contrôle d'avertissement" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" "Afficher un message de progression tous les NOMBRE enregistrements (10 par " "défaut)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "ACTION" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "exécuter l'ACTION à chaque point de contrôle" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "" "Afficher un message si tous les liens n'ont pas pu être suivis et archivés" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "SIGNAL" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2246,35 +2282,35 @@ msgstr "" "sont : SIGHUP, SIGQUIT, SIGINT, SIGUSR1 et SIGUSR2. Les noms sans préfixe « " "SIG » sont aussi acceptés" -#: src/tar.c:802 +#: src/tar.c:834 msgid "print file modification times in UTC" msgstr "Afficher les dates de modification de fichier en UTC" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "afficher l'heure du fichier en pleine résolution" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "Envoyer la sortie détaillée vers le FICHIER" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "Afficher le numéro du bloc de l'archive avec chaque message" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "Demander confirmation pour chaque action" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "Afficher les paramètres par défaut de tar" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2282,33 +2318,33 @@ msgstr "" "Lors du listage ou de l'extraction, lister chaque répertoire qui ne concorde " "pas avec le critère de recherche" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "Afficher les noms des fichiers ou des archives après transformation" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "STYLE" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "" "Définir le style de protection de caractères appliqués aux noms. Voir ci-" "dessous pour les valeurs du STYLE" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "Protéger aussi les caractères faisant partie de la CHAÃŽNE" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "Enlever la protection des caractères faisant partie de la CHAÃŽNE" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "Options de compatibilité :" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2316,15 +2352,15 @@ msgstr "" "Lors de la création, identique à « --old-archive ». Lors de l'extraction, " "identique à « --no-same-owner »" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "Autres options :" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "Désactiver certaines options potentiellement néfastes" -#: src/tar.c:978 +#: src/tar.c:1010 #, fuzzy msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " @@ -2333,40 +2369,40 @@ msgstr "" "Vous ne pouvez pas sélectionner plus d'une option parmi « -Acdtrux » ou « --" "test-label »" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Options de compression non compatibles entre elles" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "Type de signal inconnu : %s" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "Fichier d'échantillon de date non trouvé" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Remplacement par %s du format de date inconnu %s" -#: src/tar.c:1108 +#: src/tar.c:1140 #, fuzzy, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "Option %s : date « %s » traitée comme %s" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "Filtrer l'archive à travers %s" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "Les arguments valables pour l'option « --quoting-style » sont :" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2374,49 +2410,49 @@ msgstr "" "\n" "Les valeurs par défaut de *ce* tar sont :\n" -#: src/tar.c:1295 +#: src/tar.c:1330 #, fuzzy msgid "Invalid owner or group ID" msgstr "Propriétaire non valable" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Facteur de bloc non valable" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "Longueur de cartouche non valable" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "Mauvaise valeur pour le niveau incrémental" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "Plus d'une date seuil" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "Version de la dispersion non valable" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" "--atime-preserve='system' n'est pas pris en charge sur cette plateforme" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "la valeur de « --checkpoint » n'est pas un entier" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Mode non valable donné en option" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "Nombre non valable" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" @@ -2424,71 +2460,68 @@ msgstr "" "L'option --preserve est obsolète, utilisez --preserve-permissions --preserve-" "order à la place" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Taille d'enregistrement non valable" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "La taille d'un enregistrement doit être un multiple de %d." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "Nombre d'éléments incorrect" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "Une seule option « --to-command » est permise" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "Argument de densité incorrect : %s" -#: src/tar.c:2133 +#: src/tar.c:2205 #, fuzzy, c-format msgid "Unknown density: '%c'" msgstr "Densité inconnue : « %c »" -#: src/tar.c:2150 +#: src/tar.c:2222 #, fuzzy, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "Les options « -[0-7][lmh] » ne sont pas prises en charge par *ce* tar" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[FICHIER]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 +#, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "Le motif %s ne peut être utilisé" + +#: src/tar.c:2389 #, fuzzy, c-format msgid "Old option '%c' requires an argument." msgstr "L'ancienne option « %c » a besoin d'un argument." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence n'a pas de sens sans une liste de fichiers" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "" -"« --occurrence » ne peut être utilisée dans le mode d'opération demandé" - -#: src/tar.c:2408 +#: src/tar.c:2490 #, fuzzy msgid "Multiple archive files require '-M' option" msgstr "Les fichiers d'archives multiples ont besoin de l'option « -M »" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "Impossible de combiner « --listed-incremental » avec « --newer »" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "--level n'a aucun sens sans --listed-incremental" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" @@ -2497,81 +2530,77 @@ msgstr[0] "" msgstr[1] "" "%s: l'étiquette du volume est trop longue (la limite est %lu octets)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Impossible de vérifier des archives multi-volumes" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Impossible de vérifier des archives compressées" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "Le motif %s ne peut être utilisé" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Impossible d'utiliser des archives multi-volumes compressées" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "Impossible de concaténer des archives compressées" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option peut être utilisée uniquement avec des archives POSIX" -#: src/tar.c:2478 +#: src/tar.c:2560 #, fuzzy msgid "--acls can be used only on POSIX archives" msgstr "--pax-option peut être utilisée uniquement avec des archives POSIX" -#: src/tar.c:2483 +#: src/tar.c:2565 #, fuzzy msgid "--selinux can be used only on POSIX archives" msgstr "--pax-option peut être utilisée uniquement avec des archives POSIX" -#: src/tar.c:2488 +#: src/tar.c:2570 #, fuzzy msgid "--xattrs can be used only on POSIX archives" msgstr "--pax-option peut être utilisée uniquement avec des archives POSIX" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "Le motif %s ne peut être utilisé" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" +msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "" "La longueur du volume ne peut pas être inférieure à la taille de " "l'enregistrement" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "--preserve-order n'est pas compatible avec --listed-incremental" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "Je refuse de créer un fichier d'archive vide (oui je suis lâche)" -#: src/tar.c:2565 +#: src/tar.c:2669 #, fuzzy msgid "Options '-Aru' are incompatible with '-f -'" msgstr "Les options « -Aru » sont incompatibles avec « -f - »" -#: src/tar.c:2660 +#: src/tar.c:2766 #, fuzzy msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" msgstr "Vous devez choisir une option parmi « -Acdtrux » ou « --test-label »" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "Arrêt avec code d'échec à cause des erreurs précédentes" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" @@ -2579,52 +2608,52 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s : fichier réduit de %s octet" msgstr[1] "%s: fichier réduit de %s octets" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "Le mot clé %s est inconnu ou n'est pas encore implémenté" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" msgstr "L'horodatage est en dehors de la plage permise" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "Le motif %s ne peut être utilisé" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Le mot clé %s ne peut pas être surdéfini" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "En-tête étendu incorrect : longueur manquante" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "La longueur de l'en-tête étendu %*s est hors plage" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "En-tête étendu incorrect : espace blanche manquante après la longueur" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "En-tête étendu incorrect : signe d'égalité manquant" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "En-tête étendu incorrect : retour à la ligne manquant" -#: src/xheader.c:740 +#: src/xheader.c:741 #, fuzzy, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "Le mot clé inconnu « %s » pour l'en-tête étendu a été ignoré" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" @@ -2632,46 +2661,46 @@ msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "L'en-tête étendu %s=%s est hors plage %s..%s" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "En-tête étendu incorrect : %s=%s non valable" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "En-tête étendu incorrect : %s=%s en trop" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "En-tête étendu incorrect : %s non valable : délimiteur %c non prévu" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "En-tête étendu incorrect : %s non valable : nombre impair de valeurs" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "%s : délai d'expiration non valable" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "%s : action de point de contrôle inconnue" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "écriture" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "lecture" @@ -2679,7 +2708,7 @@ msgstr "lecture" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "Point de contrôle d'écriture %u" @@ -2688,7 +2717,7 @@ msgstr "Point de contrôle d'écriture %u" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "Point de contrôle de lecture %u" @@ -2956,12 +2985,20 @@ msgstr "La commande s'est terminée\n" msgid "--stat requires file names" msgstr "--stat nécessite un nom de fichier" -#~ msgid "Cannot get working directory" -#~ msgstr "Impossible de connaître le répertoire de travail" - #~ msgid "sort names to extract to match archive" #~ msgstr "Trier les noms à extraire dans le même ordre que l'archive" +#, fuzzy +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "" +#~ "« --occurrence » ne peut être utilisée dans le mode d'opération demandé" + +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "Impossible de combiner « --listed-incremental » avec « --newer »" + +#~ msgid "--preserve-order is not compatible with --listed-incremental" +#~ msgstr "--preserve-order n'est pas compatible avec --listed-incremental" + #~ msgid "Field too long while reading snapshot file" #~ msgstr "" #~ "Champ trop long rencontré pendant la lecture du fichier d'instantané" @@ -2972,12 +3009,15 @@ msgstr "--stat nécessite un nom de fichier" #~ msgid "Unexpected field value in snapshot file" #~ msgstr "Valeur de champ inattendue dans le fichier d'instantané" -#~ msgid "Extended header length is out of allowed range" -#~ msgstr "La longueur de l'en-tête étendu est hors plage" +#~ msgid "Cannot get working directory" +#~ msgstr "Impossible de connaître le répertoire de travail" #~ msgid "Invalid group" #~ msgstr "Groupe non valable" +#~ msgid "Extended header length is out of allowed range" +#~ msgstr "La longueur de l'en-tête étendu est hors plage" + #~ msgid "%s: Directory removed before we read it" #~ msgstr "%s : Répertoire supprimé avant d'avoir été lu" diff --git a/po/ga.gmo b/po/ga.gmo index 1cabb0f..ca99483 100644 Binary files a/po/ga.gmo and b/po/ga.gmo differ diff --git a/po/ga.po b/po/ga.po index 14b5eff..0bbb661 100644 --- a/po/ga.po +++ b/po/ga.po @@ -2,12 +2,12 @@ # Copyright (C) 2003, 2004 Free Software Foundation, Inc. # This file is distributed under the same license as the tar package. # Kevin Patrick Scannell , 2003, 2004, 2006, 2007, 2008, 2009. -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" "Project-Id-Version: tar 1.22\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" "PO-Revision-Date: 2009-03-25 20:27-0600\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" @@ -101,7 +101,7 @@ msgstr "taispeáin an chabhair seo" msgid "give a short usage message" msgstr "taispeáin beagán eolais faoin úsáid" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "AINM" @@ -413,9 +413,7 @@ msgstr "Seol tuairiscí fabhtanna chuig %s.\n" #: gnu/version-etc.c:249 #, fuzzy, c-format msgid "Report %s bugs to: %s\n" -msgstr "" -"\n" -"Seol tuairiscí fabhtanna chuig <%s>.\n" +msgstr "Seol tuairiscí fabhtanna chuig %s.\n" #: gnu/version-etc.c:253 #, c-format @@ -436,7 +434,7 @@ msgstr "Cabhair ghinearálta le bogearraí GNU: .\n #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: Theip ar fheidhm %s" @@ -445,27 +443,27 @@ msgstr "%s: Theip ar fheidhm %s" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: Rabhadh: Theip ar fheidhm %s" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: Ní féidir an mód a athrú go %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: Ní féidir an t-úinéir a athrú go UID %lu, GID %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: Ní féidir nasc crua a dhéanamh le %s" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" @@ -475,7 +473,7 @@ msgstr[2] "%s: Earráid léimh ag beart %s, agus %lu bheart á léamh" msgstr[3] "%s: Earráid léimh ag beart %s, agus %lu mbeart á léamh" msgstr[4] "%s: Earráid léimh ag beart %s, agus %lu beart á léamh" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" @@ -485,22 +483,22 @@ msgstr[2] "%s: Rabhadh: Earráid léimh ag beart %s, agus %lu bheart á léamh" msgstr[3] "%s: Rabhadh: Earráid léimh ag beart %s, agus %lu mbeart á léamh" msgstr[4] "%s: Rabhadh: Earráid léimh ag beart %s, agus %lu beart á léamh" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: Ní féidir 'seek' a dhéanamh ag %s" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: Rabhadh: Ní féidir 'seek' a dhéanamh ag %s" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: Ní féidir nasc siombalach a chruthú le %s" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -611,8 +609,8 @@ msgstr "Comhadchríoch gan choinne" msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "UIMHIR" @@ -620,10 +618,10 @@ msgstr "UIMHIR" msgid "set debug level" msgstr "" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "COMHAD" @@ -645,59 +643,67 @@ msgstr "an iomarca argóintí" msgid "Garbage command" msgstr "Ordú dramhaíola" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Ní cosúil le cartlann `tar' é seo" -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" -msgstr "Bearta scríofa go hiomlán" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" msgstr "Bearta léite go hiomlán" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "Bearta scríofa go hiomlán" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Bearta scriosta go hiomlán: %s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(píopa)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "Luach neamhbhailí do record_size" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Ní thugtar ainm na cartlainne" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Ní féidir cartlann stdin/stdout a fhíorú" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Is cartlann chomhbhrúite í seo. Úsáid an rogha %s" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Ní féidir cartlanna comhbhrúite a nuashonrú" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "Tosach na téipe, ag scor anois" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "An iomarca earráidí, ag scor" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" @@ -707,7 +713,7 @@ msgstr[2] "Méid taifid = %lu bhloc" msgstr[3] "Méid taifid = %lu mbloc" msgstr[4] "Méid taifid = %lu bloc" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" @@ -717,38 +723,38 @@ msgstr[2] "Bloc neamhailínithe (%lu bheart) sa chartlann" msgstr[3] "Bloc neamhailínithe (%lu mbeart) sa chartlann" msgstr[4] "Bloc neamhailínithe (%lu beart) sa chartlann" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "Ní féidir an chartlann a chúlú; is dócha gur doléite í gan -i" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "Níor stopadh rmtlseek ag teorainn taifid" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: tá uimhir imleabhair neamhbhailí ann" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "Uimhir imleabhair thar maoil" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "" "Socraigh an t-imleabhar #%d le haghaidh %s agus brúigh an eochair iontrála: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "Fuarthas comhadchríoch in áit freagra ón úsáideoir" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "RABHADH: Tá an chartlann neamhiomlán" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -760,67 +766,67 @@ msgstr "" " q Tobscoir tar\n" " y nó líne nua Lean ar aghaidh\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Sceith fobhlaosc\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? Priontáil an liosta seo\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Níl aon imleabhar nua; ag scor.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "Ainm an chomhaid gan sonrú. Bain triail eile as.\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Ionchur neamhbhailí. Iontráil ? chun cabhair a fháil.\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "Theip ar ordú %s" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" "Seans go leanann %s ar aghaidh ar an imleabhar seo: tá ainm teasctha sa " "cheanntásc" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "Ní leanann %s ar an imleabhar seo" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "Níl %s an méid ceart (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Tá an t-imleabhar seo as ord (%s - %s != %s)" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "Lipéad ar chartlann nach comhoiriúnaithe le %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "Níl an t-imleabhar %s comhoiriúnaithe le %s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -828,7 +834,7 @@ msgstr "" "%s: ní féidir an comhadainm seo a stóráil i gceanntásc il-imleabhar GNU; " "teasctha" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "níor stop an scríobh ag teorainn bhloic" @@ -842,16 +848,16 @@ msgstr[2] "Níorbh fhéidir ach %lu de %lu bheart a léamh" msgstr[3] "Níorbh fhéidir ach %lu de %lu mbeart a léamh" msgstr[4] "Níorbh fhéidir ach %lu de %lu beart a léamh" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "Tá difríocht idir na hábhair" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "Comhadchríoch gan choinne i gcartlann" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "Tá difríocht idir na cineálacha comhaid" @@ -871,7 +877,7 @@ msgstr "Tá difríocht idir na GIDanna" msgid "Mod time differs" msgstr "Tá difríocht idir na hamanna modhnaithe" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Tá difríocht idir na méideanna" @@ -888,30 +894,30 @@ msgstr "Tá difríocht idir na naisc shiombalacha" msgid "Device number differs" msgstr "Tá difríocht idir na huimhreacha gléis" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Fíoraigh " -#: src/compare.c:471 +#: src/compare.c:473 #, fuzzy, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "%s: Cineál anaithnid comhaid `%c', déan diff mar ghnáthchomhad" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "Tá comhaid sa chartlann agus a réimíreanna scriosta." -#: src/compare.c:533 +#: src/compare.c:535 #, fuzzy msgid "Archive contains transformed file names." msgstr "Tá ceanntásca le bunuimhir 64 i léig sa chartlann" -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "Nach féidir i gcónaí na bunchomhaid a aimsiú agus le linn fíoraithe." -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" @@ -921,7 +927,7 @@ msgstr[2] "THEIP AR DHEIMHNIÚ: aimsíodh %d cheanntásc neamhbhailí" msgstr[3] "THEIP AR DHEIMHNIÚ: aimsíodh %d gceanntásc neamhbhailí" msgstr[4] "THEIP AR DHEIMHNIÚ: aimsíodh %d ceanntásc neamhbhailí" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "Bloc nialasach scoite ag %s" @@ -970,55 +976,55 @@ msgstr[2] "%s: %s bheart níos lú sa chomhad; ag stuáil le nialais" msgstr[3] "%s: %s mbeart níos lú sa chomhad; ag stuáil le nialais" msgstr[4] "%s: %s beart níos lú sa chomhad; ag stuáil le nialais" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: is ar chóras comhad eile é an comhad; gan dumpáil" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "ábhar gan dumpáil" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Cineál anaithnid comhaid; ag déanamh neamhshuim air" -#: src/create.c:1549 +#: src/create.c:1551 #, fuzzy, c-format msgid "Missing links to %s." msgstr "Naisc le %s ar iarraidh.\n" -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: comhad gan athrú; gan dumpáil" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: is ionann é agus an chartlann féin; gan dumpáil" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "níor dumpáladh an chomhadlann" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: athraíodh an comhad agus á léamh" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: rinneadh neamhshuim ar an soicéad" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: rinneadh neamhshuim ar an doras" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Ag bogadh go dtí an chéad cheanntásc eile" @@ -1066,7 +1072,7 @@ msgstr "" msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Ní féidir an comhad a bhaint amach -- ar lean ó imleabhar eile" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" msgstr "Ceanntásc ainm fada gan choinne" @@ -1110,157 +1116,157 @@ msgstr "%s: is ar chóras comhad eile é an comhad; gan dumpáil" msgid "%s: Directory has been renamed" msgstr "%s: Athainmníodh an chomhadlann" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "Stampa ama neamhbhailí" -#: src/incremen.c:1045 +#: src/incremen.c:1047 #, fuzzy msgid "Invalid modification time" msgstr "Am neamhbhailí mionathraithe (soicindí)" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "Am neamhbhailí mionathraithe (nanashoicindí)" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "Uimhir neamhbhailí gléis" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Uimhir inode as raon" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" msgstr "" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" msgstr "Comhadchríoch gan choinne sa chomhad roghbhlúire" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" msgstr "" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" msgstr "" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "Críochnaitheoir taifid ar iarraidh" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "Drochfhormáid incriminteach" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "" "Ní thacaítear leis an leagan seo den fhormáid incriminteach: %" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "dumpdir míchumtha: bhíothas ag súil le '%c' ach fuarthas %#3o" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "dumpdir míchumtha: 'X' faoi dhó" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "dumpdir míchumtha: ainm folamh i 'R'" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "dumpdir míchumtha: 'T' gan 'R' roimhe" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "dumpdir míchumtha: ainm folamh i 'T'" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" "dumpdir míchumtha: bhíothas ag súil le '%c' ach fuarthas deireadh na sonraí" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "dumpdir míchumtha: níor úsáideadh 'X' riamh" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Ní féidir comhadlann shealadach a chruthú le teimpléad %s" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: ní féidir an chomhadlann a stat: gan ghlanadh" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: tá an chomhadlann ar ghléas eile ar fad; gan ghlanadh" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s á scriosadh\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: Ní féidir scriosadh a dhéanamh" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: ag fágáil ar lár" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "bloc %s: ** bloc de NULanna **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "bloc %s: ** Deireadh comhaid **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "bloc %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Bearnaí sa cheanntásc; ag súil le luach uimhriúil %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1268,96 +1274,96 @@ msgstr "" "ag glacadh le comhlánú dénártha" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Tá an luach ochtnártha %.*s as raon %s sa chartlann" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "Tá ceanntásca le bunuimhir 64 i léig sa chartlann" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Teaghrán %s le sín agus bunuimhir 64 as raon %s sa chartlann" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Tá an luach le bunuimhir 256 as raon %s sa chartlann" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Tá %.*s sa chartlann; ag súil le luach uimhriúil %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Tá an luach cartlainne %s as raon %s: %s..%s" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " nasc le %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " cineál anaithnid comhaid %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--Nasc Fada--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--Ainm Fada--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Ceanntásc Imleabhair--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Ar lean ag beart %s--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Comhadlann á cruthú:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "%s á athainmniú go %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Ní féidir athainmniú go %s" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "%s á athainmniú go %s arís\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Scriosadh an comhad sular léadh é" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "macphróiseas" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "bealach idir próisis" @@ -1371,7 +1377,7 @@ msgstr "Theip ar ordú %s" msgid "%s: file list requested from %s already read from %s" msgstr "%s: léadh an liosta comhad cheana" -#: src/names.c:448 +#: src/names.c:448 src/checkpoint.c:274 #, fuzzy, c-format msgid "cannot split string '%s': %s" msgstr "ní féidir an t-am a shocrú ar `%s'" @@ -1381,59 +1387,59 @@ msgstr "ní féidir an t-am a shocrú ar `%s'" msgid "%s: file name read contains nul character" msgstr "%s: tá carachtar nialasach sa chomhadainm a léadh" -#: src/names.c:821 +#: src/names.c:824 #, fuzzy msgid "Pattern matching characters used in file names" msgstr "Aimsíodh saoróga in ainmneacha comhaid." -#: src/names.c:823 +#: src/names.c:826 #, fuzzy msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "Úsáid --wildcards chun comhoiriúnú patrún a chumasú, nó --no-wildcards" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: Ní sa chartlann é" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Níl rud riachtanach sa chartlann" -#: src/names.c:876 +#: src/names.c:879 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "Lipéad ar chartlann nach comhoiriúnaithe le %s" -#: src/names.c:1180 +#: src/names.c:1183 #, fuzzy msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "Níl --preserve-order comhoiriúnach do --listed-incremental" -#: src/names.c:1186 +#: src/names.c:1189 #, fuzzy msgid "Only one -C option is allowed with --listed-incremental" msgstr "Níl --preserve-order comhoiriúnach do --listed-incremental" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "Tá an gnáth-ionchur de dhíth ar na roghanna `-%s' agus `-%s'" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s: Formáid neamhbhailí chartlainne" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "Níl roghanna GNU ar fáil d'fhormáid neamh-chomhoiriúnach chartlainne" -#: src/tar.c:255 +#: src/tar.c:264 #, fuzzy, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." @@ -1441,7 +1447,7 @@ msgstr "" "Stíl anaithnid athfhriotail `%s'. Bain triail as `%s --quoting-style=help' " "chun liosta a fheiceáil." -#: src/tar.c:364 +#: src/tar.c:378 #, fuzzy msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " @@ -1462,7 +1468,7 @@ msgstr "" "(foclach).\n" " tar -xf cartlann.tar # Bain gach comhad amach as cartlann.tar.\n" -#: src/tar.c:373 +#: src/tar.c:387 #, fuzzy msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1485,80 +1491,80 @@ msgstr "" "bhfuil\n" " never, simple déan cúltacaí simplí i gcónaí\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "Príomh-mhód oibre:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "taispeáin an t-ábhar i gcartlann" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "bain comhaid as cartlann" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "cruthaigh cartlann nua" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "taispeáin difríochtaí idir cartlann agus córas comhaid" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "iarcheangail le deireadh cartlainne" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "ná hiarcheangail ach comhaid mhionathraithe leis an gcartlann" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "iarcheangail comhaid tar le cartlann" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "scrios as an gcartlann (nach ar théipeanna maighnéadacha!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "tástáil lipéad imleabhair na cartlainne agus scoir" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "Mionathraitheoirí oibríochta:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "caith le gannchomhaid go héifeachtach" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "PRÃOMH[.MION]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" "socraigh leagan fhormáid na ngannchomhad le húsáid (--sparse intuigthe)" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "déan cúltaca incriminteach de shean-nós GNU" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "déan cúltaca incriminteach nua-aoise GNU" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "ná scoir le stádas earráide má tá comhad doléite ann" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1570,137 +1576,145 @@ msgstr "" "extract nó --list agus nuair a thugtar liosta comhad ar líne na n-orduithe " "nó leis an rogha -T; de réir réamhshocraithe UIMHIR=1" -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "tá an chartlann inchuardaithe" -#: src/tar.c:453 +#: src/tar.c:467 #, fuzzy msgid "archive is not seekable" msgstr "tá an chartlann inchuardaithe" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "" "ná seiceáil uimhreacha gléasanna agus cartlanna incriminteacha á gcruthú" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" "seiceáil uimhreacha gléasanna agus cartlanna incriminteacha á gcruthú " "(réamhshocrú)" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "Rialú forscríofa:" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "fíoraigh an chartlann i ndiaidh ag scríobh" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "scrios comhaid i ndiaidh iad a chur leis an gcartlann" -#: src/tar.c:471 +#: src/tar.c:485 #, fuzzy msgid "don't replace existing files when extracting, treat them as errors" msgstr "ná forscríobh comhaid atá ann le linn baint amach" -#: src/tar.c:474 +#: src/tar.c:488 #, fuzzy msgid "don't replace existing files when extracting, silently skip over them" msgstr "ná forscríobh comhaid atá ann le linn baint amach" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "" "ná forscríobh comhaid atá ann má tá siad níos nuaí ná na cinn sa chartlann" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "forscríobh comhaid atá ann le linn baint amach" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "scrios gach comhaid sula scríobhtar air" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "folmhaigh géagchóras sula mbaintear comhadlann amach" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "ná forscríobh meiteashonraí comhadlainne" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "forscríobh meiteashonraí de chomhadlanna atá ann agus cartlanna á mbaint " "amach (réamhshocrú)" -#: src/tar.c:490 +#: src/tar.c:504 #, fuzzy msgid "preserve existing symlinks to directories when extracting" msgstr "forscríobh comhaid atá ann le linn baint amach" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "COMHADLANN" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "Roghnaigh sruth aschurtha:" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "bain comhaid amach agus scríobh ar an ngnáth-aschur" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "ORDÚ" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "píopaigh comhaid bhainte go ríomhchlár eile" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "ná bac le cóid scortha na macphróiseas" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "láimhseáil cóid scortha nach nialas ó mhacphróisis mar earráidí" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Tréithe comhaid á láimhseáil:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "éiligh AINM mar úinéir de chomhaid bhreise" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "éiligh AINM mar ghrúpa de chomhaid bhreise" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "DÃTA-NÓ-COMHAD" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "socraigh am mionathraithe na gcomhad nua de réir DÃTA-NÓ-COMHAD" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "ATHRUITHE" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "déan ATHRUITHE ar mhód de chomhaid bhreise" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "MODH" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " @@ -1710,31 +1724,31 @@ msgstr "" "ndiaidh na comhaid a léamh (MODH='replace', réamhshocraithe), nó gan a " "bheith ag socrú na n-amanna sa chéad áit (MODH='system')" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "ná bain am mionathraithe an chomhaid" -#: src/tar.c:528 +#: src/tar.c:545 #, fuzzy msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" msgstr "bain triail as úinéireacht a choinneáil" -#: src/tar.c:530 +#: src/tar.c:547 #, fuzzy msgid "extract files as yourself (default for ordinary users)" msgstr "bain comhaid amach mar thusa féin" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "bain úsáid as uimhreacha d'ainmneacha úsáideora/grúpa" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "bain eolas faoi cheadanna (réamhshocrú don fhorúsáideoir)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1742,16 +1756,16 @@ msgstr "" "cuir umask an úsáideora i bhfeidhm agus ceadanna á mbaint ón chartlann " "(réamhshocrú do ghnáthúsáideoirí)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "ar comhbhrí le -p agus -s araon" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1759,180 +1773,188 @@ msgstr "" "ná socraigh amanna mionathraithe ná ceadanna de na comhadlanna go dtí go " "bhfuil an bhaint curtha i gcrích" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "cealaigh an éifeacht de rogha --delay-directory-restore" -#: src/tar.c:554 +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 #, fuzzy msgid "Handling of extended file attributes:" msgstr "Tréithe comhaid á láimhseáil:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" msgstr "" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" msgstr "" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" msgstr "" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" msgstr "" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" msgstr "" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" msgstr "" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" msgstr "" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" msgstr "" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "Roghnú gléis agus malartú:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "CARTLANN" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "bain úsáid as cartlann chomhaid nó gléas CARTLANN" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "is logánta í an chartlann fiú má tá idirstad ina hainm" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "bain úsáid as ORDÚ in ionad rmt" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "bain úsáid as ORDÚ cian in ionad rsh" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "sonraigh tiomántán agus a dhlús" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "cruthaigh/liostaigh/bain amach cartlann le hiliomad imleabhair" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "athraigh téip i ndiaidh UIMHIR × 1024 beart" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "rith script i ndiaidh gach téip (-M intuigthe)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "úsáid/nuashonraigh an uimhir imleabhair i gCOMHAD" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "Blocáil ghléis:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "BLOIC" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "BLOIC × 512 beart sa taifead" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "UIMHIR beart sa taifead, iolraí de 512" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "déan neamhshuim ar bhloic nialasacha sa chartlann (is ionann le EOF)" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "athbhlocáil le linn léimh (le píopaí 4.2BSD)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "Roghnú formáide:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "FORMÃID" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "cruthaigh cartlann san fhormáid seo" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "Is FORMÃID ceann de na rudaí seo:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "seanfhormáid V7 tar" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "formáid de réir GNU tar <= 1.12" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "formáid de réir GNU tar 1.13" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "formáid POSIX 1003.1-1988 (ustar)" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "formáid POSIX 1003.1-2001 (pax)" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "ar comhbhrí le pax" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "is ionann le --format=v7" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "is ionann le --format=posix" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "lorgfhocal[[:]=luach][,lorgfhocal[[:]=luach]]..." -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "rialaigh lorgfhocail pax" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "TÉACS" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1940,79 +1962,77 @@ msgstr "" "cruthaigh cartlann le TÉACS mar ainm imleabhair; úsáid TÉACS mar phatrún " "globála ar an ainm imleabhair agus an chartlann á liostú/baint amach" -#: src/tar.c:660 +#: src/tar.c:684 msgid "Compression options:" msgstr "Roghanna comhbhrúite:" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "úsáid iarmhír na cartlainne chun an modh comhbhrúite a dhéanamh amach" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "" "ná húsáid iarmhír na cartlainne chun an clár comhbhrúite a dhéanamh amach" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "CLÃR" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "scag le CLÃR (ní foláir -d)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "Roghnú comhaid logánta:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" "cuir an COMHAD sainithe leis an gcartlann (is áisiúil an rogha seo nuair atá " "dais ag tosach an chomhadainm)" -#: src/tar.c:687 -msgid "DIR" -msgstr "COMHADLANN" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "athraigh go dtí COMHADLANN" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "tóg ainmneacha le baint/cruthú as comhad COMHAD" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "léigh ainmneacha, foirceanta le NULanna; múch -C" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "díchumasaigh an rogha --null roimhe seo" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" msgstr "" "bain comharthaí athfhriotail ó chomhadainmneacha a léadh le -T (réamhshocrú)" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" msgstr "ná bain comharthaí athfhriotail ó chomhadainmneacha a léadh le -T" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "PATRÚN" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "fág comhaid as an áireamh, tugtha mar PHATRÚN" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "fág as an áireamh aon phatrún atá i gCOMHAD" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -2020,96 +2040,111 @@ msgstr "" "gabh thar ábhar na gcomhadlann ina bhfuil CACHEDIR.TAG, seachas an comhad " "clibe féin" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "gabh thar gach rud faoi chomhadlanna ina bhfuil CACHEDIR.TAG" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "gabh thar chomhadlanna ina bhfuil CACHEDIR.TAG" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "gabh thar ábhar na gcomhadlann ina bhfuil COMHAD, seachas COMHAD féin" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "gabh thar gach rud faoi chomhadlanna ina bhfuil COMHAD" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "gabh thar chomhadlanna a bhfuil COMHAD iontu" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "gabh thar chomhadlanna a bhaineann le córas rialaithe foinsí" -#: src/tar.c:721 +#: src/tar.c:751 +#, fuzzy +msgid "read exclude patterns from the VCS ignore files" +msgstr "ná bain úsáid as saoróga i bpatrúin eisiata" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "ná téigh isteach i bhfochomhadlanna go huathoibríoch" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "ná fág an córas comhaid seo agus cartlann á cruthú" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "téigh isteach i gcomhadlanna (réamhshocrú)" -#: src/tar.c:729 +#: src/tar.c:761 #, fuzzy msgid "don't strip leading '/'s from file names" msgstr "ná struipeáil `/' tosaigh ó ainmneacha comhaid" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "" "lean naisc shiombalacha; cartlannaigh agus dumpáil na comhaid a nascann na " "naisc leo" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "" "lean naisc chrua; cartlannaigh agus dumpáil na comhaid a nascann na naisc leo" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "AINM-BAILL" -#: src/tar.c:735 +#: src/tar.c:767 #, fuzzy msgid "begin at member MEMBER-NAME when reading the archive" msgstr "tosaigh ag ball AINM-BAILL sa chartlann" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "ná sábháil comhaid níos nuaí ná DÃTA-NÓ-COMHAD" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "DÃTA" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "déan comparáid le dáta/am modhnaithe" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "MODH" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "déan cúltaca sula scriostar, roghnaigh modh oibre maidir le leaganacha" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "TEAGHRÃN" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -2117,104 +2152,104 @@ msgstr "" "déan cúltaca roimh bhaint, agus sáraigh an gnáth-iarmhír ('~' mura dtugtar é " "leis an athróg thimpeallachta SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "Trasfhoirmiú ainmneacha comhaid:" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "struipeáil UIMHIR comhpháirt tosaigh ó ainmneacha comhaid" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "SLONN" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "" "Úsáid ordú ionadaíochta SLONN, i bhformáid \"sed\", chun ainmneacha comhaid " "a thrasfhoirmiú" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "Roghanna maidir le comhoiriúnú ainmneacha comhaid (cuirfear iad seo i " "bhfeidhm do phatrúin eisiata agus do phatrúin iniata araon):" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "ná bí cásíogair" # subject is "exclude patterns" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "comhoiriúnaíonn patrúin do thosach ainm an chomhaid" -#: src/tar.c:767 +#: src/tar.c:799 #, fuzzy msgid "patterns match after any '/' (default for exclusion)" msgstr "comhoiriúnaíonn patrúin tar éis gach `/' (réamhshocrú i gcás eisiata)" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "dealaigh idir litreacha beaga/móra (réamhshocrú)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "úsáid saoróga (réamhshocrú do phatrúin eisiata)" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "comhoiriúnú teaghráin carachtar ar charachtar" -#: src/tar.c:775 +#: src/tar.c:807 #, fuzzy msgid "wildcards do not match '/'" msgstr "ní ghlacann saoróga le `/'" -#: src/tar.c:777 +#: src/tar.c:809 #, fuzzy msgid "wildcards match '/' (default for exclusion)" msgstr "comhoiriúnaíonn saoróga do `/' (réamhshocrú le patrúin eisiata)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Aschur faisnéiseach:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "taispeáin gach comhad atá próiseáilte, go foclach" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "" -#: src/tar.c:787 +#: src/tar.c:819 #, fuzzy msgid "warning control" msgstr "Rialú forscríofa:" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "cuir dul chun cinn ar taispeáint, gach UIMHIRú taifid (réamhshocrú 10)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "GNÃOMH" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "déan GNÃOMH ag gach seicphointe" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "taispeáin eolas mura bhfuil gach nasc dumpáilte" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "COMHARTHA" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2226,36 +2261,36 @@ msgstr "" "Ceadaítear na comharthaí seo a leanas: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 agus " "SIGUSR2; glacfar leis na hainmneacha céanna gan an réimír SIG freisin" -#: src/tar.c:802 +#: src/tar.c:834 #, fuzzy msgid "print file modification times in UTC" msgstr "taispeáin dátaí mionathraithe de réir UTC" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "scríobh aschur foclach i gCOMHAD" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "taispeáin bloc sa chartlann le gach teachtaireacht" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "iarr deimhniú ar gach gníomh" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "taispeáin réamhshocruithe tar" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2263,33 +2298,33 @@ msgstr "" "agus á liostú nó á bhaint amach, taispeáin gach comhadlann nach bhfuil " "comhoiriúnaithe don chuardach" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "taispeáin ainmneacha comhaid/cartlainne i ndiaidh trasfhoirmithe" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "STÃL" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "" "socraigh stíl athfhriotail ainmneacha; féach thíos le haghaidh luachanna " "bailí do STÃL" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "cuir carachtair athfhriotail timpeall na carachtair ó TEAGHRÃN" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "ná húsáid comharthaí athfhriotail timpeall carachtair ó TEAGHRÃN" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "Roghanna Comhoiriúnachta:" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2297,56 +2332,56 @@ msgstr "" "is ionann le --old-archive le linn cruthaithe; is ionann le --no-same-owner " "le linn baint" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "Roghanna eile:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "cuir bac ar úsáid de roghanna gurbh fhéidir leo a bheith urchóideach" -#: src/tar.c:978 +#: src/tar.c:1010 #, fuzzy msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" msgstr "Ná tabhair ach ceann de na roghanna `-Acdtrux'" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Roghanna contrártha comhbhrúite" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "Comhartha anaithnid: %s" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "Comhad samplach dáta gan aimsiú" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Formáid dáta anaithnid; ag baint úsáid as %s in ionad %s" -#: src/tar.c:1108 +#: src/tar.c:1140 #, fuzzy, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "Rogha %s: Ag caitheamh le dáta `%s' mar %s" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, fuzzy, c-format msgid "filter the archive through %s" msgstr "scag an chartlann le xz" -#: src/tar.c:1179 +#: src/tar.c:1214 #, fuzzy msgid "Valid arguments for the --quoting-style option are:" msgstr "Argóintí bailí do roghanna --quoting-style:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2354,49 +2389,49 @@ msgstr "" "\n" "Luachanna réamhshocraithe don tar *seo*:\n" -#: src/tar.c:1295 +#: src/tar.c:1330 #, fuzzy msgid "Invalid owner or group ID" msgstr "Úinéir neamhbhailí" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Fachtóir bacainneach neamhbhailí" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "Fad téipe neamhbhailí" -#: src/tar.c:1466 +#: src/tar.c:1521 #, fuzzy msgid "Invalid incremental level value" msgstr "Drochfhormáid incriminteach" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "Níos mó ná spriocdháta amháin" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "Leagan neamhbhailí ar fhormáid na ngannchomhad" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "ní thacaítear le --atime-preserve='system' ar an chóras seo" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "ní mór do luach --checkpoint a bheith ina slánuimhir" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Mód neamhbhailí ar rogha" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "Uimhir neamhbhailí" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" @@ -2404,71 +2439,69 @@ msgstr "" "tá an rogha --preserve dulta i léig, bain úsáid as --preserve-permissions --" "preserve-order ina háit" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Méid taifid neamhbhailí" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "Ní foláir méid taifid a bheith iolraí de %d." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "Tá líon na mball neamhbhailí" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "Ní cheadaítear ach aon rogha --to-command amháin" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "Tá an argóint dlúis míchumtha: %s" -#: src/tar.c:2133 +#: src/tar.c:2205 #, fuzzy, c-format msgid "Unknown density: '%c'" msgstr "Dlús anaithnid: `%c'" -#: src/tar.c:2150 +#: src/tar.c:2222 #, fuzzy, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "Níl na roghanna `-[0-7][lmh]' ar fáil sa leagan seo tar" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[COMHAD]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 +#, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "Ní féidir an patrún %s a úsáid" + +#: src/tar.c:2389 #, fuzzy, c-format msgid "Old option '%c' requires an argument." msgstr "Tá gá le hargóint ar an seanrogha `%c'." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "tá an rogha --occurrence gan bhrí in éagmais liosta comhad" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "níl an rogha --occurrence ar fáil sa mhód iarrtha" - -#: src/tar.c:2408 +#: src/tar.c:2490 #, fuzzy msgid "Multiple archive files require '-M' option" msgstr "Ní foláir an rogha `-M' le níos mó ná cartlann amháin" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "Ní féidir --listed-incremental a úsáid le --newer" - -#: src/tar.c:2416 +#: src/tar.c:2498 #, fuzzy msgid "--level is meaningless without --listed-incremental" msgstr "Níl --preserve-order comhoiriúnach do --listed-incremental" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" @@ -2478,79 +2511,75 @@ msgstr[2] "%s: Lipéad imleabhair rófhada (%lu bheart ar a mhéad)" msgstr[3] "%s: Lipéad imleabhair rófhada (%lu mbeart ar a mhéad)" msgstr[4] "%s: Lipéad imleabhair rófhada (%lu beart ar a mhéad)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Ní féidir cartlanna le hiliomad imleabhair a fhíorú" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Ní féidir cartlanna comhbhrúite a fhíorú" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "Ní féidir an patrún %s a úsáid" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Ní féidir úsáid a bhaint as cartlanna il-ranna comhbhrúite" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "Ní féidir cartlanna comhbhrúite a iarcheangal" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "níl an rogha --pax-option le fáil ach le cartlanna POSIX" -#: src/tar.c:2478 +#: src/tar.c:2560 #, fuzzy msgid "--acls can be used only on POSIX archives" msgstr "níl an rogha --pax-option le fáil ach le cartlanna POSIX" -#: src/tar.c:2483 +#: src/tar.c:2565 #, fuzzy msgid "--selinux can be used only on POSIX archives" msgstr "níl an rogha --pax-option le fáil ach le cartlanna POSIX" -#: src/tar.c:2488 +#: src/tar.c:2570 #, fuzzy msgid "--xattrs can be used only on POSIX archives" msgstr "níl an rogha --pax-option le fáil ach le cartlanna POSIX" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "Ní féidir an patrún %s a úsáid" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" +msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "Ní cheadaítear fad an imleabhair a bheith níos lú ná an mhéid taifid" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "Níl --preserve-order comhoiriúnach do --listed-incremental" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "Ní chruthófar cartlann fholamh (go cladhartha)" -#: src/tar.c:2565 +#: src/tar.c:2669 #, fuzzy msgid "Options '-Aru' are incompatible with '-f -'" msgstr "Níl na roghanna `-Aru' ar fáil in éineacht le `-f -'" -#: src/tar.c:2660 +#: src/tar.c:2766 #, fuzzy msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" msgstr "Ní foláir rogha amháin de `-Acdtrux' ar a laghad" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "Scor le stádas teipthe de bharr earráidí roimhe seo" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" @@ -2561,54 +2590,54 @@ msgstr[2] "%s: Chrap an comhad %s bheart" msgstr[3] "%s: Chrap an comhad %s mbeart" msgstr[4] "%s: Chrap an comhad %s beart" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "Tá an lorgfhocal %s anaithnid nó nach bhfuil sé curtha i bhfeidhm fós" -#: src/xheader.c:173 +#: src/xheader.c:174 #, fuzzy msgid "Time stamp is out of allowed range" msgstr "Stampa ama as raon" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "Ní féidir an patrún %s a úsáid" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Ní féidir an lorgfhocal %s a shárú" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "Ceanntásc míchumtha breisithe: fad ar iarraidh" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "Fad %*s as raon sa cheanntásc breisithe" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "Ceanntásc míchumtha breisithe: spás bán ar iarraidh tar éis an fhaid" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "Ceanntásc míchumtha breisithe: sín chothroime ar iarraidh" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "Ceanntásc míchumtha breisithe: líne nua ar iarraidh" -#: src/xheader.c:740 +#: src/xheader.c:741 #, fuzzy, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "" "Lorgfhocal anaithnid `%s' sa cheanntásc breisithe; ag déanamh neamhshuim air" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" @@ -2616,48 +2645,48 @@ msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "Tá an ceanntásc breisithe %s=%s as raon %s..%s" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Ceanntásc míchumtha breisithe: %s=%s neamhbhailí" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Ceanntásc míchumtha breisithe: %s=%s sa bhreis" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" "Ceanntásc míchumtha breisithe: %s neamhbhailí: bhíothas ag súil le " "teormharcóir %c" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "Ceanntásc míchumtha breisithe: %s neamhbhailí: corruimhir de luachanna" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "%s: teorainn ama neamhbhailí" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "%s: gníomh anaithnid seicphointe" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "scríobh" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "léamh" @@ -2665,7 +2694,7 @@ msgstr "léamh" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "Seicphointe scríofa %u" @@ -2674,7 +2703,7 @@ msgstr "Seicphointe scríofa %u" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "Seicphointe léimh %u" @@ -2939,50 +2968,22 @@ msgstr "Ordú críochnaithe\n" msgid "--stat requires file names" msgstr "Tá ainmneacha comhaid de dhíth ar --stat" -#, fuzzy -#~ msgid "Cannot get working directory" -#~ msgstr "Ní féidir an chomhadlann reatha a athrú" - #~ msgid "sort names to extract to match archive" #~ msgstr "sórtáil ainmneacha le cur in oiriúint" -#~ msgid "Field too long while reading snapshot file" -#~ msgstr "Réimse rófhada agus an comhad roghbhlúire á léamh" - -#~ msgid "Read error in snapshot file" -#~ msgstr "Earráid agus an comhad roghbhlúire á léamh" - -#~ msgid "Unexpected field value in snapshot file" -#~ msgstr "Luach réimse gan choinne sa chomhad roghbhlúire" - -#~ msgid "Extended header length is out of allowed range" -#~ msgstr "Fad an cheanntáisc breisithe as raon" - #, fuzzy -#~ msgid "Invalid group" -#~ msgstr "%s: Grúpa neamhbhailí" +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "níl an rogha --occurrence ar fáil sa mhód iarrtha" -#, fuzzy -#~ msgid "%s: Directory removed before we read it" -#~ msgstr "%s: Scriosadh an comhad sular léadh é" +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "Ní féidir --listed-incremental a úsáid le --newer" -#, fuzzy -#~ msgid "Cannot restore working directory" -#~ msgstr "Ní féidir an chomhadlann reatha a shábháil" - -#, fuzzy -#~ msgid "Cannot resolve hostname %s" -#~ msgstr "Ní féidir %s a athainmniú go %s" - -#~ msgid "suppress this warning." -#~ msgstr "chun an rabhadh seo a mhúchadh." +#~ msgid "--preserve-order is not compatible with --listed-incremental" +#~ msgstr "Níl --preserve-order comhoiriúnach do --listed-incremental" #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: rogha neamhcheadaithe -- %c\n" -#~ msgid "Reading %s\n" -#~ msgstr "%s á léamh\n" - #~ msgid "" #~ "\n" #~ "Report bugs to <%s>.\n" @@ -2990,21 +2991,6 @@ msgstr "Tá ainmneacha comhaid de dhíth ar --stat" #~ "\n" #~ "Seol tuairiscí fabhtanna chuig <%s>.\n" -#~ msgid "filter the archive through bzip2" -#~ msgstr "scag an chartlann le bzip2" - -#~ msgid "filter the archive through gzip" -#~ msgstr "scag an chartlann le gzip" - -#~ msgid "filter the archive through compress" -#~ msgstr "scag an chartlann le compress" - -#~ msgid "filter the archive through lzma" -#~ msgstr "scag an chartlann le lzma" - -#~ msgid "filter the archive through lzop" -#~ msgstr "scag an chartlann le lzop" - #~ msgid "Input string too long" #~ msgstr "Teaghrán ionchurtha rófhada" @@ -3039,9 +3025,51 @@ msgstr "Tá ainmneacha comhaid de dhíth ar --stat" #~ msgid "Premature end of file" #~ msgstr "Comhadchríoch gan choinne" +#~ msgid "Reading %s\n" +#~ msgstr "%s á léamh\n" + #~ msgid "Error is not recoverable: exiting now" #~ msgstr "Ní féidir biseach a dhéanamh i ndiaidh earráid: ag scor" +#~ msgid "Field too long while reading snapshot file" +#~ msgstr "Réimse rófhada agus an comhad roghbhlúire á léamh" + +#~ msgid "Read error in snapshot file" +#~ msgstr "Earráid agus an comhad roghbhlúire á léamh" + +#~ msgid "Unexpected field value in snapshot file" +#~ msgstr "Luach réimse gan choinne sa chomhad roghbhlúire" + +#~ msgid "Cannot save working directory" +#~ msgstr "Ní féidir an chomhadlann reatha a shábháil" + +#~ msgid "Cannot change working directory" +#~ msgstr "Ní féidir an chomhadlann reatha a athrú" + +#~ msgid "suppress this warning." +#~ msgstr "chun an rabhadh seo a mhúchadh." + +#~ msgid "filter the archive through bzip2" +#~ msgstr "scag an chartlann le bzip2" + +#~ msgid "filter the archive through gzip" +#~ msgstr "scag an chartlann le gzip" + +#~ msgid "filter the archive through compress" +#~ msgstr "scag an chartlann le compress" + +#~ msgid "filter the archive through lzma" +#~ msgstr "scag an chartlann le lzma" + +#~ msgid "filter the archive through lzop" +#~ msgstr "scag an chartlann le lzop" + +#~ msgid "%s: Invalid group" +#~ msgstr "%s: Grúpa neamhbhailí" + +#~ msgid "Extended header length is out of allowed range" +#~ msgstr "Fad an cheanntáisc breisithe as raon" + #~ msgid "Warning: the -I option is not supported; perhaps you meant -j or -T?" #~ msgstr "Rabhadh: níl an rogha -I ar fáil; ar mhaith leat -j nó -T?" @@ -3108,9 +3136,6 @@ msgstr "Tá ainmneacha comhaid de dhíth ar --stat" #~ msgid "Missing file name after -C" #~ msgstr "Ainm comhaid ar iarraidh i ndiaidh -C" -#~ msgid "exclude patterns are plain strings" -#~ msgstr "ná bain úsáid as saoróga i bpatrúin eisiata" - #~ msgid "exclude patterns use wildcards (default)" #~ msgstr "bain úsáid as saoróga i bpatrúin (réamhshocrú)" diff --git a/po/gl.gmo b/po/gl.gmo index 856e9cd..25e58cb 100644 Binary files a/po/gl.gmo and b/po/gl.gmo differ diff --git a/po/gl.po b/po/gl.po index 0370b44..a51e82e 100644 --- a/po/gl.po +++ b/po/gl.po @@ -2,12 +2,12 @@ # Copyright (C) 2002 Free Software Foundation, Inc. # Jacobo Tarrío Barreiro , 2002. # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" "Project-Id-Version: tar 1.13.25\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" "PO-Revision-Date: 2002-03-26 19:17+0100\n" "Last-Translator: Jacobo Tarrío Barreiro \n" "Language-Team: Galician \n" @@ -101,7 +101,7 @@ msgstr "" msgid "give a short usage message" msgstr "" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "" @@ -392,10 +392,7 @@ msgstr "" #: gnu/version-etc.c:249 #, fuzzy, c-format msgid "Report %s bugs to: %s\n" -msgstr "" -"\n" -"Informe dos erros no programa a .\n" -"Informe dos erros na traducción a .\n" +msgstr "Renomeando %s a %s\n" #: gnu/version-etc.c:253 #, c-format @@ -415,7 +412,7 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: Non se pode %s" @@ -424,56 +421,56 @@ msgstr "%s: Non se pode %s" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: Aviso: Non se pode %s" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: Non se pode cambia-lo modo a %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: Non se pode cambia-la propiedade ao uid %lu, gid %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: Non se pode libar a %s" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, fuzzy, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Erro de lectura no byte %s, lendo %lu bytes" msgstr[1] "%s: Erro de lectura no byte %s, lendo %lu bytes" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, fuzzy, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Aviso: Erro de lectura no byte %s, lendo %lu bytes" msgstr[1] "%s: Aviso: Erro de lectura no byte %s, lendo %lu bytes" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: Non se pode saltar a %s" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: Aviso: Non se pode saltar a %s" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: Non se pode crear unha ligazón simbólica a %s" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, fuzzy, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -577,11 +574,17 @@ msgid "Unexpected arguments" msgstr "Fin de ficheiro inesperado nos nomes alterados" #: rmt/rmt.c:689 +#, fuzzy msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "" +"Emprego: %s [OPCIÓN]\n" +"Manipula unha unidade de fita, aceptando comandos dun proceso remoto.\n" +"\n" +" --version Amosar información da versión.\n" +" --help Amosar esta axuda.\n" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "" @@ -589,10 +592,10 @@ msgstr "" msgid "set debug level" msgstr "" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "" @@ -614,104 +617,112 @@ msgstr "" msgid "Garbage command" msgstr "Comando lixo" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Isto non semella un arquivo tar" -#: src/buffer.c:521 src/buffer.c:530 +#: src/buffer.c:574 +msgid "Total bytes read" +msgstr "" + +#: src/buffer.c:576 #, fuzzy msgid "Total bytes written" msgstr "Bytes totais escritos: %s (%sB, %sB/s)\n" -#: src/buffer.c:528 src/buffer.c:542 -msgid "Total bytes read" -msgstr "" - -#: src/buffer.c:532 -#, fuzzy, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Bytes totais escritos: %s (%sB, %sB/s)\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(canalización)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "Valor non válido para record_size" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Non se proporcionou o nome do arquivo" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Non se poden verifica-los arquivos da entrada/saída estándar" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Non se poden actualiza-los arquivos comprimidos" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "No comezo da cinta, saíndo agora" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "Demasiados erros, saíndo" -#: src/buffer.c:893 +#: src/buffer.c:944 #, fuzzy, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Tamaño do rexistro = %lu bloques" msgstr[1] "Tamaño do rexistro = %lu bloques" -#: src/buffer.c:914 +#: src/buffer.c:965 #, fuzzy, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "Bloque desaliñado (%lu bytes) no arquivo" msgstr[1] "Bloque desaliñado (%lu bytes) no arquivo" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "Non se pode recuar no arquivo; pode ser ilexible sen -i" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: contén un número de volume non válido" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "Desbordamento no número de volume" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Prepare o volume #%d para %s e prema enter: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "Chegouse á fin de ficheiro onde se esperaba unha resposta do usuario" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "AVISO: O arquivo está incompleto" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -723,71 +734,71 @@ msgstr "" " ! Executar outro intérprete de comandos\n" " ? Amosar esta lista\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Non hai novos volumes; saíndo.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, fuzzy, c-format msgid "%s command failed" msgstr "O comando \"%s\" fallou" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, fuzzy, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s non continúa neste volume" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s non continúa neste volume" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s ten un tamaño incorrecto (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Este volume está fora da secuencia" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "O arquivo non está etiquetado para coincidir con %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "O volume %s non coincide con %s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" -#: src/buffer.c:1866 +#: src/buffer.c:1917 #, fuzzy msgid "write did not end on a block boundary" msgstr "A fin do ficheiro (EOF) do arquivo %s non se atopa no límite do bloque" @@ -799,16 +810,16 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "So se puido ler %lu de %lu bytes" msgstr[1] "So se puido ler %lu de %lu bytes" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "O contido é diferente" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "Fin de ficheiro inesperado no arquivo" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "O tipo de ficheiro é diferente" @@ -828,7 +839,7 @@ msgstr "Os gid son diferentes" msgid "Mod time differs" msgstr "A data de modificación é diferente" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "O tamaño é diferente" @@ -845,38 +856,38 @@ msgstr "A ligaz msgid "Device number differs" msgstr "O número de dispositivo é diferente" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Verificar " -#: src/compare.c:471 -#, fuzzy, c-format +#: src/compare.c:473 +#, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "" "%s: Tipo de ficheiro \"%c\" descoñecido; trátase coma un ficheiro normal" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "" -#: src/compare.c:533 +#: src/compare.c:535 #, fuzzy msgid "Archive contains transformed file names." msgstr "O arquivo contén cabeceiras base-64 obsoletas" -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "" -#: src/compare.c:612 +#: src/compare.c:614 #, fuzzy, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "FALLO NA VERIFICACION: detectáronse %d cabeceiras non válidas" msgstr[1] "FALLO NA VERIFICACION: detectáronse %d cabeceiras non válidas" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "" @@ -922,56 +933,56 @@ msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "%s: O ficheiro encolleu %s bytes; enchendo con ceros" msgstr[1] "%s: O ficheiro encolleu %s bytes; enchendo con ceros" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: o ficheiro está nun sistema de ficheiros diferente; non se envorca" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 #, fuzzy msgid "contents not dumped" msgstr " (memoria volcada)" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Tipo de ficheiro descoñecido; ignórase este ficheiro" -#: src/create.c:1549 +#: src/create.c:1551 #, fuzzy, c-format msgid "Missing links to %s." msgstr " ligazón a %s\n" -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: ficheiro sen cambios; non se envorca" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: o ficheiro é o arquivo; non se envorca" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: o ficheiro cambiou mentres se lía" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: ignórase o socket" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: ignórase a porta" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Pasando á seguinte cabeceira" @@ -1017,13 +1028,13 @@ msgstr "Tentando extrae-las ligaz msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Non se pode extraer -- o ficheiro é continuación doutro volume" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 #, fuzzy msgid "Unexpected long name header" msgstr "Fin de ficheiro (EOF) inesperado no arquivo" #: src/extract.c:1542 -#, fuzzy, c-format +#, c-format msgid "%s: Unknown file type '%c', extracted as normal file" msgstr "" "%s: Tipo de ficheiro \"%c\" descoñecido, extraéndoo coma ficheiro normal" @@ -1063,157 +1074,157 @@ msgstr "%s: o ficheiro est msgid "%s: Directory has been renamed" msgstr "%s: Renomeouse o directorio" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "Marca de tempo non válida" -#: src/incremen.c:1045 +#: src/incremen.c:1047 #, fuzzy msgid "Invalid modification time" msgstr "Proporcionouse na opción un modo non válido" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "Número de dispositivo non válido" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Número de inode non válido" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" msgstr "" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Fin de ficheiro (EOF) inesperado no arquivo" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" msgstr "" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" msgstr "" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Non se pode reservar memoria para o factor de bloqueo %d" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, fuzzy, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: o ficheiro está nun sistema de ficheiros diferente; non se envorca" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Borrando %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: Non se pode eliminar" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: Omitíndoo" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "bloque %s: ** Bloque de nulos **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "bloque %s: ** Fin de Ficheiro **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "bloque %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "" "Atopáronse espacios na cabeceira onde se esperaba un valor númerico de %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1221,96 +1232,96 @@ msgstr "" "a 2" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "O valor octal do arquivo %.*s está fóra do rango de %s" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "O arquivo contén cabeceiras base-64 obsoletas" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "A cadea base-64 asinada do arquivo %s está fóra do rango de %s" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "O valor base-256 do arquivo está fóra do rango de %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "O arquivo contén %.*s onde se esperaba un valor numérico de %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "O valor do arquivo %s está fóra do rango de %s %s..%s" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " ligazón a %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " Tipo de ficheiro %s descoñecido\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Cabeceira de Volume--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Continúa no byte %s--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Creando o directorio:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "Renomeando %s a %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Non se pode renomear a %s" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "Renomeando %s a %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Ficheiro eliminado antes da súa lectura" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "proceso fillo" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "canle interproceso" @@ -1320,75 +1331,75 @@ msgid "command line" msgstr "O comando \"%s\" fallou" #: src/names.c:378 -#, fuzzy, c-format +#, c-format msgid "%s: file list requested from %s already read from %s" -msgstr "%s: o ficheiro é o arquivo; non se envorca" +msgstr "" -#: src/names.c:448 -#, fuzzy, c-format +#: src/names.c:448 src/checkpoint.c:274 +#, c-format msgid "cannot split string '%s': %s" -msgstr "Non se puido evalua-lo ficheiro %s" +msgstr "" #: src/names.c:490 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: Non atopado no arquivo" -#: src/names.c:842 +#: src/names.c:845 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Non atopado no arquivo" -#: src/names.c:876 +#: src/names.c:879 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "O arquivo non está etiquetado para coincidir con %s" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "As opcións \"-%s\" e \"-%s\" precisan da entrada estándar" -#: src/tar.c:163 +#: src/tar.c:164 #, fuzzy, c-format msgid "%s: Invalid archive format" msgstr "%s: Grupo non válido" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "Quérense as características de GNU no formato de arquivo incompatible" -#: src/tar.c:255 +#: src/tar.c:264 #, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." msgstr "" -#: src/tar.c:364 +#: src/tar.c:378 #, fuzzy msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " @@ -1409,7 +1420,7 @@ msgstr "" " # dando moitos datos\n" " %s -xf arquivo.tar # Extraer tódolos ficheiros de arquivo.tar.\n" -#: src/tar.c:373 +#: src/tar.c:387 #, fuzzy msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1431,80 +1442,80 @@ msgstr "" " nil, existing numera se existen copias de seguridade numeradas\n" " never, simple sempre fai copias de seguridade sinxelas\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "" -#: src/tar.c:411 +#: src/tar.c:425 #, fuzzy msgid "create a new archive" msgstr "Fin de ficheiro inesperado no arquivo" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1512,617 +1523,643 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:469 +#: src/tar.c:483 #, fuzzy msgid "remove files after adding them to the archive" msgstr "Borrando a especificación de unidade dos nomes do arquivo" -#: src/tar.c:471 +#: src/tar.c:485 msgid "don't replace existing files when extracting, treat them as errors" msgstr "" -#: src/tar.c:474 +#: src/tar.c:488 msgid "don't replace existing files when extracting, silently skip over them" msgstr "" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:490 +#: src/tar.c:504 msgid "preserve existing symlinks to directories when extracting" msgstr "" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "" -#: src/tar.c:499 +#: src/tar.c:516 #, fuzzy msgid "extract files to standard output" msgstr "Erro ao gravar na saída estándar" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " "place (METHOD='system')" msgstr "" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" msgstr "" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:554 +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 msgid "Handling of extended file attributes:" msgstr "" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" msgstr "" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" msgstr "" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" msgstr "" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" msgstr "" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" msgstr "" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" msgstr "" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" msgstr "" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" msgstr "" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "" -#: src/tar.c:603 +#: src/tar.c:627 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Non se pode verifica-los arquivos multi-volume" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:629 +#: src/tar.c:653 #, fuzzy msgid "Archive format selection:" msgstr "Arquivar da entrada estándar" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:660 +#: src/tar.c:684 #, fuzzy msgid "Compression options:" msgstr "Opcións de compresión conflictivas" -#: src/tar.c:662 +#: src/tar.c:686 #, fuzzy msgid "use archive suffix to determine the compression program" msgstr "Non se puido escribir no programa de compresión" -#: src/tar.c:664 +#: src/tar.c:688 #, fuzzy msgid "do not use archive suffix to determine the compression program" msgstr "Non se puido escribir no programa de compresión" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:687 -msgid "DIR" -msgstr "" - -#: src/tar.c:688 +#: src/tar.c:712 #, fuzzy msgid "change to directory DIR" msgstr "Non se pode cambia-lo directorio de traballo" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +msgid "unquote input file or member names (default)" msgstr "" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +msgid "do not unquote input file or member names" msgstr "" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:729 +#: src/tar.c:761 #, fuzzy msgid "don't strip leading '/'s from file names" msgstr "Eliminadndo o \"%.*s\" inicial dos nomes dos membros" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:735 +#: src/tar.c:767 msgid "begin at member MEMBER-NAME when reading the archive" msgstr "" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "" -#: src/tar.c:767 +#: src/tar.c:799 msgid "patterns match after any '/' (default for exclusion)" msgstr "" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "" -#: src/tar.c:775 +#: src/tar.c:807 #, fuzzy msgid "wildcards do not match '/'" msgstr "O volume %s non coincide con %s" -#: src/tar.c:777 +#: src/tar.c:809 msgid "wildcards match '/' (default for exclusion)" msgstr "" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2130,317 +2167,310 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:802 -#, fuzzy +#: src/tar.c:834 msgid "print file modification times in UTC" -msgstr "Proporcionouse na opción un modo non válido" +msgstr "" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:810 +#: src/tar.c:842 #, fuzzy msgid "ask for confirmation for every action" msgstr "Non se puido le-la confirmación do usuario" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:978 +#: src/tar.c:1010 #, fuzzy msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" msgstr "Non pode especificar máis dunha das opcións \"-Acdtrux\"" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Opcións de compresión conflictivas" -#: src/tar.c:1047 +#: src/tar.c:1079 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr " Tipo de ficheiro %s descoñecido\n" -#: src/tar.c:1071 +#: src/tar.c:1103 #, fuzzy msgid "Date sample file not found" msgstr "Non se atopou o ficheiro de data" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Substituíndo o formato de data descoñecido %2$s por %1$s" -#: src/tar.c:1108 +#: src/tar.c:1140 #, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 -#, fuzzy, c-format +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 +#, c-format msgid "filter the archive through %s" -msgstr "%s: o ficheiro é o arquivo; non se envorca" +msgstr "" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1295 +#: src/tar.c:1330 #, fuzzy msgid "Invalid owner or group ID" msgstr "Propietario non válido" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Factor de bloqueo non válido" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "Lonxitude da fita non válida" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "Máis dunha data de umbral" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Proporcionouse na opción un modo non válido" -#: src/tar.c:1858 +#: src/tar.c:1925 #, fuzzy msgid "Invalid number" msgstr "Número de inode non válido" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Tamaño de rexistro non válido" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "O tamaño do rexistro debe ser múltiplo de %d." -#: src/tar.c:1975 +#: src/tar.c:2042 #, fuzzy msgid "Invalid number of elements" msgstr "Lonxitude da fita non válida" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:2133 +#: src/tar.c:2205 #, fuzzy, c-format msgid "Unknown density: '%c'" msgstr "Patrón descoñecido `%s'" -#: src/tar.c:2150 +#: src/tar.c:2222 #, fuzzy, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "Opcións `-[0-7][lmh]' non soportadas por *este* tar" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "" -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 +#, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "%s: Non se pode saltar a %s" + +#: src/tar.c:2389 #, fuzzy, c-format msgid "Old option '%c' requires an argument." msgstr "A antiga opción \"%c\" precisa dun argumento." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2389 -#, c-format -msgid "--occurrence cannot be used with %s" -msgstr "" - -#: src/tar.c:2408 +#: src/tar.c:2490 #, fuzzy msgid "Multiple archive files require '-M' option" msgstr "Varios ficheiros de arquivo requiren a opción \"-M\"" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "Non se pode combinar --listed-incremental con --newer" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "" -#: src/tar.c:2433 +#: src/tar.c:2515 #, fuzzy, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "%s: A etiqueta do volume é longa de máis (o límite é %lu bytes)" msgstr[1] "%s: A etiqueta do volume é longa de máis (o límite é %lu bytes)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Non se pode verifica-los arquivos multi-volume" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Non se poden verifica-los arquivos comprimidos" -#: src/tar.c:2450 -#, c-format -msgid "--verify cannot be used with %s" -msgstr "" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Non se poden empregar arquivos comprimidos multi-volume" -#: src/tar.c:2461 +#: src/tar.c:2543 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Non se poden actualiza-los arquivos comprimidos" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2478 +#: src/tar.c:2560 msgid "--acls can be used only on POSIX archives" msgstr "" -#: src/tar.c:2483 +#: src/tar.c:2565 msgid "--selinux can be used only on POSIX archives" msgstr "" -#: src/tar.c:2488 +#: src/tar.c:2570 msgid "--xattrs can be used only on POSIX archives" msgstr "" -#: src/tar.c:2493 -#, c-format -msgid "--%s option cannot be used with %s" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "De xeito cobarde rexéitase crear un ficheiro baleiro" -#: src/tar.c:2565 +#: src/tar.c:2669 #, fuzzy msgid "Options '-Aru' are incompatible with '-f -'" msgstr "As opcións \"-Aru\" son incompatibles con \"-f -\"" -#: src/tar.c:2660 +#: src/tar.c:2766 #, fuzzy msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" msgstr "Debe especificar unha das opcións \"-Acdtrux\"" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, fuzzy, c-format msgid "%s: File shrank by %s byte" @@ -2448,99 +2478,99 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: O ficheiro encolleu %s bytes" msgstr[1] "%s: O ficheiro encolleu %s bytes" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "" -#: src/xheader.c:173 +#: src/xheader.c:174 #, fuzzy msgid "Time stamp is out of allowed range" msgstr "Marca de tempo fóra de rango" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "" -#: src/xheader.c:676 +#: src/xheader.c:677 #, fuzzy, c-format msgid "Extended header length %*s is out of range" msgstr "A cadea base-64 asinada do arquivo %s está fóra do rango de %s" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "" -#: src/xheader.c:740 +#: src/xheader.c:741 #, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, fuzzy, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "O valor do arquivo %s está fóra do rango de %s %s..%s" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, fuzzy, c-format msgid "%s: not a valid timeout" msgstr "%s: Grupo non válido" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "" @@ -2548,7 +2578,7 @@ msgstr "" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, fuzzy, c-format msgid "Write checkpoint %u" msgstr "Punto de control de escritura %d" @@ -2557,7 +2587,7 @@ msgstr "Punto de control de escritura %d" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, fuzzy, c-format msgid "Read checkpoint %u" msgstr "Punto de control de lectura %d" @@ -2628,11 +2658,8 @@ msgid "Synchronous execution options:" msgstr "" #: tests/genfile.c:163 -#, fuzzy msgid "OPTION" msgstr "" -"\n" -"Emprego: %s [OPCIÓN]...\n" #: tests/genfile.c:164 msgid "" @@ -2764,7 +2791,7 @@ msgstr "Non se puido evalua-lo ficheiro %s" #: tests/genfile.c:692 #, fuzzy, c-format msgid "cannot truncate `%s'" -msgstr "Non se puido abrir %s" +msgstr "Non se puido evalua-lo ficheiro %s" #: tests/genfile.c:701 #, fuzzy, c-format @@ -2811,94 +2838,12 @@ msgstr "" msgid "--stat requires file names" msgstr "--Nomes de ficheiro alterados--\n" -#, fuzzy -#~ msgid "Cannot get working directory" -#~ msgstr "Non se pode cambia-lo directorio de traballo" - -#, fuzzy -#~ msgid "Read error in snapshot file" -#~ msgstr "Erro de lectura en %s" - -#, fuzzy -#~ msgid "Unexpected field value in snapshot file" -#~ msgstr "Fin de ficheiro (EOF) inesperado no arquivo" - -#, fuzzy -#~ msgid "Invalid group" -#~ msgstr "%s: Grupo non válido" - -#, fuzzy -#~ msgid "%s: Directory removed before we read it" -#~ msgstr "%s: Ficheiro eliminado antes da súa lectura" - -#, fuzzy -#~ msgid "Cannot restore working directory" -#~ msgstr "Non se pode armacena-lo directorio de traballo" - -#, fuzzy -#~ msgid "Cannot resolve hostname %s" -#~ msgstr "%s: Non se pode renomear a %s" +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "Non se pode combinar --listed-incremental con --newer" #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: opción non admitida -- %c\n" -#~ msgid "Reading %s\n" -#~ msgstr "Lendo %s\n" - -#, fuzzy -#~ msgid "" -#~ "\n" -#~ "Report bugs to <%s>.\n" -#~ msgstr "" -#~ "\n" -#~ "Informe dos erros no programa a .\n" -#~ "Informe dos erros na traducción a .\n" - -#, fuzzy -#~ msgid "filter the archive through compress" -#~ msgstr "%s: o ficheiro é o arquivo; non se envorca" - -#, fuzzy -#~ msgid "filter the archive through lzma" -#~ msgstr "%s: o ficheiro é o arquivo; non se envorca" - -#, fuzzy -#~ msgid "filter the archive through lzop" -#~ msgstr "%s: o ficheiro é o arquivo; non se envorca" - -#~ msgid "rmtd: Cannot allocate buffer space\n" -#~ msgstr "rmtd: Non se pode reservar espacio para o buffer\n" - -#~ msgid "Cannot allocate buffer space" -#~ msgstr "Non se pode reservar espacio para o buffer" - -#~ msgid "Try `%s --help' for more information.\n" -#~ msgstr "Escriba '%s --help' para máis información.\n" - -#, fuzzy -#~ msgid "" -#~ "Usage: %s [OPTION]\n" -#~ "Manipulate a tape drive, accepting commands from a remote process.\n" -#~ "\n" -#~ " --version Output version info.\n" -#~ " --help Output this help.\n" -#~ msgstr "" -#~ "Emprego: %s [OPCIÓN]\n" -#~ "Manipula unha unidade de fita, aceptando comandos dun proceso remoto.\n" -#~ "\n" -#~ " --version Amosar información da versión.\n" -#~ " --help Amosar esta axuda.\n" - -#, fuzzy -#~ msgid "Seek offset error" -#~ msgstr "Desprazamento fóra de rango" - -#~ msgid "Premature end of file" -#~ msgstr "Fin de ficheiro prematura" - -#~ msgid "Error is not recoverable: exiting now" -#~ msgstr "O erro non é recuperable: sáese agora" - #~ msgid "block size" #~ msgstr "tamaño de bloque" @@ -2914,6 +2859,9 @@ msgstr "--Nomes de ficheiro alterados--\n" #~ msgid "tar (grandchild)" #~ msgstr "tar (neto)" +#~ msgid "Reading %s\n" +#~ msgstr "Lendo %s\n" + #~ msgid "WARNING: No volume header" #~ msgstr "AVISO: Non hai unha cabeceira de volume" @@ -2929,6 +2877,9 @@ msgstr "--Nomes de ficheiro alterados--\n" #~ msgid "Visible long name error" #~ msgstr "Erro no nome longo visible" +#~ msgid "Error is not recoverable: exiting now" +#~ msgstr "O erro non é recuperable: sáese agora" + #~ msgid "Device number out of range" #~ msgstr "Número de dispositivo fóra de rango" @@ -2950,6 +2901,12 @@ msgstr "--Nomes de ficheiro alterados--\n" #~ msgid "Missing file name after -C" #~ msgstr "Falta o nome de ficheiro despois de -C" +#~ msgid "rmtd: Cannot allocate buffer space\n" +#~ msgstr "rmtd: Non se pode reservar espacio para o buffer\n" + +#~ msgid "Cannot allocate buffer space" +#~ msgstr "Non se pode reservar espacio para o buffer" + #~ msgid "" #~ "This program comes with NO WARRANTY, to the extent permitted by law.\n" #~ "You may redistribute it under the terms of the GNU General Public " @@ -2962,6 +2919,9 @@ msgstr "--Nomes de ficheiro alterados--\n" #~ "chamado\n" #~ "COPYING para máis detalles." +#~ msgid "Premature end of file" +#~ msgstr "Fin de ficheiro prematura" + #~ msgid "rmtd: Garbage command %c\n" #~ msgstr "rmtd: Comando lixo %c\n" @@ -3429,6 +3389,9 @@ msgstr "--Nomes de ficheiro alterados--\n" #~ msgid "Only wrote %u of %u bytes to %s" #~ msgstr "Só escritos %u dun total de %u bytes en %s" +#~ msgid "Read error on %s" +#~ msgstr "Erro de lectura en %s" + #~ msgid "Only read %d bytes from archive %s" #~ msgstr "So lidos %d bytes do arquivo %s" diff --git a/po/hr.gmo b/po/hr.gmo index 1abd837..fc3de27 100644 Binary files a/po/hr.gmo and b/po/hr.gmo differ diff --git a/po/hr.po b/po/hr.po index 977cb7a..d81de9c 100644 --- a/po/hr.po +++ b/po/hr.po @@ -8,12 +8,12 @@ # Mirsad Todorovac , 2002. # Tomislav Krznar , 2012. # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" "Project-Id-Version: tar 1.26\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" "PO-Revision-Date: 2012-12-21 00:09+0100\n" "Last-Translator: Tomislav Krznar \n" "Language-Team: Croatian \n" @@ -106,7 +106,7 @@ msgstr "prikaži ovaj popis pomoći" msgid "give a short usage message" msgstr "prikaži kratke upute za uporabu" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "IME" @@ -442,7 +442,7 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: Ne mogu izvrÅ¡iti %s" @@ -451,27 +451,27 @@ msgstr "%s: Ne mogu izvrÅ¡iti %s" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: Upozorenje: Ne mogu izvrÅ¡iti %s" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: Ne mogu promijeniti mod u %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: Ne mogu promijeniti vlasniÅ¡tvo u uid %lu, gid %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: Ne mogu napraviti Ävrstu vezu na %s" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" @@ -479,7 +479,7 @@ msgstr[0] "%s: GreÅ¡ka Äitanja na bajtu %s pri Äitanju %lu bajta" msgstr[1] "%s: GreÅ¡ka Äitanja na bajtu %s pri Äitanju %lu bajta" msgstr[2] "%s: GreÅ¡ka Äitanja na bajtu %s pri Äitanju %lu bajtova" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" @@ -487,22 +487,22 @@ msgstr[0] "%s: Upozorenje: GreÅ¡ka Äitanja na bajtu %s pri Äitanju %lu bajta" msgstr[1] "%s: Upozorenje: GreÅ¡ka Äitanja na bajtu %s pri Äitanju %lu bajta" msgstr[2] "%s: Upozorenje: GreÅ¡ka Äitanja na bajtu %s pri Äitanju %lu bajtova" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: Ne mogu ići na %s" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: Upozorenje: Ne mogu ići na %s" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: Ne mogu napraviti simboliÄku vezu na %s" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -605,8 +605,8 @@ msgstr "NeoÄekivani argumenti" msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "Upravlja pogonom vrpce, prihvaćajući naredbe udaljenog procesa" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "BROJ" @@ -614,10 +614,10 @@ msgstr "BROJ" msgid "set debug level" msgstr "postavi razinu debugiranja" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "DATOTEKA" @@ -639,61 +639,69 @@ msgstr "previÅ¡e argumenata" msgid "Garbage command" msgstr "Naredba smeća" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Ovo ne izgleda kao tar arhiva" +#: src/buffer.c:574 +msgid "Total bytes read" +msgstr "Ukupno proÄitano bajtova" + # FIXME -- ovo neće raditi ako je prevedeno -- Denis? -#: src/buffer.c:521 src/buffer.c:530 +#: src/buffer.c:576 msgid "Total bytes written" msgstr "Ukupno zapisano bajtova" -#: src/buffer.c:528 src/buffer.c:542 -msgid "Total bytes read" -msgstr "Ukupno proÄitano bajtova" - # FIXME -- ovo neće raditi ako je prevedeno -- Denis? -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Ukupno izbrisano bajtova: %s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(cjevovod)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "Neispravna vrijednost za record_size" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Nije zadano ime arhive" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Ne mogu provjeriti stdin/stdout arhivu" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Arhiva je komprimirana. Koristite opciju %s" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Ne mogu ažurirati komprimirane arhive" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "PoÄetak trake, zavrÅ¡avam" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "PreviÅ¡e greÅ¡aka, zavrÅ¡avam" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" @@ -701,7 +709,7 @@ msgstr[0] "VeliÄina zapisa = %lu blok" msgstr[1] "VeliÄina sloga = %lu bloka" msgstr[2] "VeliÄina sloga = %lu blokova" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" @@ -709,37 +717,37 @@ msgstr[0] "Neporavnat blok (%lu bajt) unutar arhive" msgstr[1] "Neporavnat blok (%lu bajta) unutar arhive" msgstr[2] "Neporavnat blok (%lu bajtova) unutar arhive" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "Ne mogu se pomicati unatrag unutar arhive, može biti neÄitljiva bez -i" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek nije stao na granici zapisa" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: sadrži neispravan broj dijela arhive" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "Preljev broja dijela arhive" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Pripremite dio arhive #%d za %s i pritisnite [RETURN]: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "PronaÄ‘en EOF gdje sam oÄekivao odgovor korisnika" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "UPOZORENJE: Arhiva je nepotpuna" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -751,67 +759,67 @@ msgstr "" " q Prekini tar\n" " y ili novi redak Nastavi rad\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Pokreni podljusku\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? IspiÅ¡i ovaj popis\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Nema novog dijela arhive, zavrÅ¡avam.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "Ime datoteke nije navedeno. PokuÅ¡ajte ponovo.\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Neispravan unos. Unesite ? za pomoć.\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "naredba %s nije uspjela" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" "%s je možda nastavljen na ovom dijelu arhive: zaglavlje sadrži skraćeno ime" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s nije nastavljen na ovom dijelu arhive" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s je pogreÅ¡ne veliÄine (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Ovaj dio arhive je izvan niza (%s - %s != %s)" # FIXME -- clean against source! (TM) -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "Arhiva nije oznaÄena da odgovara %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "Dio arhive %s ne odgovara %s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -819,7 +827,7 @@ msgstr "" "%s: ime datoteke je predugaÄko za spremanje u GNU viÅ¡edjelnom zaglavlju, " "skraćujem" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "pisanje nije zavrÅ¡ilo na granici bloka" @@ -831,16 +839,16 @@ msgstr[0] "ProÄitao samo %lu od %lu bajta" msgstr[1] "ProÄitao samo %lu od %lu bajta" msgstr[2] "ProÄitao samo %lu od %lu bajtova" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "Sadržaji se razlikuju" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "NeoÄekivani EOF u arhivi" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "Vrste datoteka se razlikuju" @@ -860,7 +868,7 @@ msgstr "Gid se razlikuje" msgid "Mod time differs" msgstr "Vrijeme ureÄ‘ivanja se razlikuje" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "VeliÄina se razlikuje" @@ -877,30 +885,30 @@ msgstr "SimboliÄka veza se razlikuje" msgid "Device number differs" msgstr "Broj ureÄ‘aja se razlikuje" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Provjeri " -#: src/compare.c:471 +#: src/compare.c:473 #, fuzzy, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "" "%s: Nepoznata vrsta datoteke „%câ€, izvrÅ¡en diff kao na normalnoj datoteci" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "Arhiva sadrži imena datoteka s uklonjenim poÄetnim prefiksima." -#: src/compare.c:533 +#: src/compare.c:535 msgid "Archive contains transformed file names." msgstr "Arhiva sadrži pretvorena imena datoteka." -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "Provjera možda neće uspjeti pronaći izvorne datoteke." -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" @@ -908,7 +916,7 @@ msgstr[0] "NEUSPJELA PROVJERA: otkriveno %d neispravno zaglavlje" msgstr[1] "NEUSPJELA PROVJERA: otkrivena %d neispravna zaglavlja" msgstr[2] "NEUSPJELA PROVJERA: otkriveno %d neispravnih zaglavlja" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "Izolirani nulti blok na %s" @@ -956,55 +964,55 @@ msgstr[0] "%s: Datoteka skraćena za %s bajt; nadopunjeno nulama" msgstr[1] "%s: Datoteka skraćena za %s bajta; nadopunjeno nulama" msgstr[2] "%s: Datoteka skraćena za %s bajtova; nadopunjeno nulama" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: datoteka je na drugom datoteÄnom sustavu; ne arhiviram" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "sadržaj nije arhiviran" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Nepoznata vrsta datoteke; datoteka zanemarena" -#: src/create.c:1549 +#: src/create.c:1551 #, c-format msgid "Missing links to %s." msgstr "Nedostaju veze na %s." -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: datoteka nepromijenjena; ne arhiviram" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: datoteka je arhiva; ne arhiviram" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "direktorij nije arhiviran" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: datoteka se promijenila za vrijeme Äitanja" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: utiÄnica zanemarena" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: vrata zanemarena" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "PreskaÄem na sljedeće zaglavlje" @@ -1051,7 +1059,7 @@ msgid "%s: Cannot extract -- file is continued from another volume" msgstr "" "%s: Ne mogu ekstrahirati -- datoteka se nastavlja iz drugog dijela arhive" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" msgstr "NeoÄekivano zaglavlje dugaÄkog imena" @@ -1095,155 +1103,155 @@ msgstr "%s: datoteka je na drugom datoteÄnom sustavu; ne arhiviram" msgid "%s: Directory has been renamed" msgstr "%s: Direktoriju je promijenjeno ime" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "Neispravna vremenska oznaka" -#: src/incremen.c:1045 +#: src/incremen.c:1047 #, fuzzy msgid "Invalid modification time" msgstr "Neispravno vrijeme ureÄ‘ivanja (sekunde)" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "Neispravno vrijeme ureÄ‘ivanja (nanosekunde)" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "Neispravan broj ureÄ‘aja" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Neispravan broj indeksnog Ävora (inode)" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" msgstr "" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" msgstr "NeoÄekivani EOF u datoteci snimke stanja" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" msgstr "" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" msgstr "" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "Nedostaje kraj zapisa" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "Neispravan inkrementalni oblik datoteke" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "Nepodržana inaÄica inkrementalnog oblika: %" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "IzobliÄen direktorij za ispis: oÄekujem „%câ€, pronaÅ¡ao %#3o" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "IzobliÄen direktorij za ispis: „X†udvostruÄen" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "IzobliÄen direktorij za ispis: prazno ime u „Râ€" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "IzobliÄen direktorij za ispis: prije „T†ne dolazi „Râ€" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "IzobliÄen direktorij za ispis: prazno ime u „Tâ€" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "IzobliÄen direktorij za ispis: ocÌŒekujem „%câ€, pronasÌŒao kraj podataka" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "IzobliÄen direktorij za ispis: „X†se uopće ne koristi" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Ne mogu napraviti privremeni direktorij koriÅ¡tenjem predloÅ¡ka %s" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Ne uklanjam direktorij: ne mogu izvrÅ¡iti stat" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: datoteka je na drugom ureÄ‘aju: ne uklanjam" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: BriÅ¡em %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: Ne mogu ukloniti" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: Izostavljam" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "blok %s: ** Blok ispunjen NUL-znakovima **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Kraj datoteke **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Praznine u zaglavlju gdje se oÄekuje numeriÄka %s vrijednost" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1251,99 +1259,99 @@ msgstr "" "komplement" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Oktalna vrijednost iz arhive %.*s je izvan %s granica" # FIXME -- obsolescent -- TM -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "Arhiva sadrži zastarjela base-64 zaglavlja" # FIXME?? -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Base-64 vrijednost s predznakom %s iz arhive je izvan %s granica" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Base-256 vrijednost iz arhive je izvan %s granica" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Arhiva sadrži %.*s gdje je oÄekivana numeriÄka %s vrijednost" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Vrijednost %s iz arhive je izvan %s raspona %s..%s" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " veza na %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " nepoznata vrsta datoteke %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--DugaÄka veza--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--DugaÄko ime--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Zaglavlje dijela arhive--\n" # FIXME -- clarify against source -- TM -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Nastavljeno na bajtu %s--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Stvaram direktorij:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "Mijenjam ime %s u %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Ne mogu preimenovati u %s" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "Mijenjam ime %s natrag u %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Datoteka uklonjena prije nego Å¡to smo ju proÄitali" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "proces dijete" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "meÄ‘uprocesni kanal" @@ -1357,7 +1365,7 @@ msgstr "naredba %s nije uspjela" msgid "%s: file list requested from %s already read from %s" msgstr "%s: popis datoteka je već proÄitan" -#: src/names.c:448 +#: src/names.c:448 src/checkpoint.c:274 #, fuzzy, c-format msgid "cannot split string '%s': %s" msgstr "ne mogu postaviti vrijeme na „%sâ€" @@ -1367,11 +1375,11 @@ msgstr "ne mogu postaviti vrijeme na „%sâ€" msgid "%s: file name read contains nul character" msgstr "%s: proÄitano ime datoteke sadrži prazan znak" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "Znakovi za usporeÄ‘ivanje uzoraka koriÅ¡teni u imenima datoteka" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1379,48 +1387,48 @@ msgstr "" "Koristite --wildcards za omogućavanje usporeÄ‘ivanja uzoraka ili --no-" "wildcards za potiskivanje ovog upozorenja" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: Nije pronaÄ‘en u arhivi" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Potrebna pojava nije pronaÄ‘en u arhivi" # FIXME -- clean against source! (TM) -#: src/names.c:876 +#: src/names.c:879 #, c-format msgid "Archive label mismatch" msgstr "Oznaka arhive ne odgovara" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "KoriÅ¡tenje opcije -C u popisu datoteka nije dozvoljeno uz --listed-" "incremental" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Samo jedna opcija -C je dozvoljena uz --listed-incremental" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "Opcije „-%s†i „-%s†obje zahtijevaju standardni ulaz" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s: Neispravan oblik arhive" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "GNU mogućnosti zatražene na nekompatibilnom obliku arhive" -#: src/tar.c:255 +#: src/tar.c:264 #, fuzzy, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." @@ -1428,7 +1436,7 @@ msgstr "" "Nepoznat stil navoÄ‘enja „%sâ€. PokuÅ¡ajte „%s --quoting-style=help†za prikaz " "popisa." -#: src/tar.c:364 +#: src/tar.c:378 #, fuzzy msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " @@ -1447,7 +1455,7 @@ msgstr "" " %s -tvf arhiva.tar # OpÅ¡irno ispiÅ¡i sve datoteke iz arhiva.tar.\n" " %s -xf arhiva.tar # Ekstrahiraj sve datoteke iz arhiva.tar.\n" -#: src/tar.c:373 +#: src/tar.c:387 #, fuzzy msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1470,80 +1478,80 @@ msgstr "" " inaÄe jednostavne\n" " never, simple uvijek radi jednostavne sigurnosne kopije\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "Glavni naÄin rada:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "ispiÅ¡i sadržaj arhive" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "ekstrahiraj datoteke iz arhive" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "napravi novu arhivu" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "naÄ‘i razlike izmeÄ‘u arhive i datoteÄnog sustava" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "dodaj datoteke na kraj arhive" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "dodaj samo datoteke novije od kopije u arhivi" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "dodaj tar datoteke u arhivu" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "izbriÅ¡i iz arhive (ne na magnetskim vrpcama!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "provjeri oznaku dijela arhive i izaÄ‘i" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "Modifikatori operacija:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "uÄinkovito upravljaj raÅ¡trkanim datotekama" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "GLAVNI[.SPOREDNI]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" "postavi inaÄicu raÅ¡trkanog oblika za koriÅ¡tenje (podrazumijeva --sparse)" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "upravljaj inkrementalnim sigurnosnim kopijama starog GNU oblika" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "upravljaj inkrementalnim sigurnosnim kopijama novog GNU oblika" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "razina ispisa za stvorene ispisane-inkrementalne arhive" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "ne izlazi s kodom razliÄitim od nule u sluÄaju neÄitljivih datoteka" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1555,130 +1563,138 @@ msgstr "" "--list te kad je popis datoteka naveden u naredbenom retku ili uz opciju -T. " "BROJ je uobiÄajeno 1." -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "arhiva se može pretraživati" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "arhiva se ne može pretraživati" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "ne provjeravaj brojeve ureÄ‘aja pri stvaranju inkrementalnih arhiva" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "provjeri brojeve ureÄ‘aja pri stvaranju inkrementalnih arhiva (zadano)" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "Upravljanje prepisivanjem:" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "pokuÅ¡aj provjeriti arhivu nakon pisanja u nju" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "ukloni datoteke nakon dodavanja u arhivu" -#: src/tar.c:471 +#: src/tar.c:485 #, fuzzy msgid "don't replace existing files when extracting, treat them as errors" msgstr "ne zamjenjuj postojeće datoteke pri ekstrakciji" -#: src/tar.c:474 +#: src/tar.c:488 #, fuzzy msgid "don't replace existing files when extracting, silently skip over them" msgstr "ne zamjenjuj postojeće datoteke pri ekstrakciji" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "ne zamjenjuj postojeće datoteke novije od kopija u arhivi" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "prepiÅ¡i postojeće datoteke pri ekstrakciji" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "ukloni svaku datoteku prije ekstrakcije preko nje" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "isprazni hijerarhije prije ekstrahiranja direktorija" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "oÄuvaj metapodatke postojećih direktorija" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "prepiÅ¡i metapodatke postojećih direktorija pri ekstrakciji (zadano)" -#: src/tar.c:490 +#: src/tar.c:504 #, fuzzy msgid "preserve existing symlinks to directories when extracting" msgstr "prepiÅ¡i postojeće datoteke pri ekstrakciji" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "DIR" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "Odaberi izlazni tok podataka:" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "ekstrahiraj datoteke na standardni izlaz" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "NAREDBA" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "proslijedi ekstrahirane datoteke drugom programu kroz cjevovod" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "zanemari izlazne kodove djece" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "postupaj s izlaznim kodovima djece razliÄitim od nule kao s greÅ¡kama" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Upravljanje svojstvima datoteka:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "prisilno postavi IME kao vlasnika dodanih datoteka" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "prisilno postavi IME kao grupu dodanih datoteka" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "DATUM-ILI-DATOTEKA" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "postavi mtime dodanih datoteka iz DATUM-ILI-DATOTEKA" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "PROMJENE" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "prisili (simboliÄke) PROMJENE moda dodanih datoteka" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "METODA" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " @@ -1688,11 +1704,11 @@ msgstr "" "Äitanja (METODA='replace'; zadano), ili ne postavljanjem vremena " "(METODA='system')" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "ne ekstrahiraj vrijeme ureÄ‘ivanja datoteke" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" @@ -1700,19 +1716,19 @@ msgstr "" "pokuÅ¡aj ekstrahirati datoteke s istim vlasniÅ¡tvom kakvo je u arhivi (zadano " "za administratora)" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "otpakiraj datoteke kao trenutni korisnik (zadano za obiÄne korisnike)" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "uvijek koristi brojke za imena korisnika/grupe" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "izdvoji informacije o dozvolama datoteka (zadano za administratora)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1720,16 +1736,16 @@ msgstr "" "primijeni korisniÄki umask pri ekstrakciji dozvola iz arhive (zadano za " "obiÄne korisnike)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "isto kao -p i -s zajedno" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1737,181 +1753,189 @@ msgstr "" "odgodi postavljanje vremena ureÄ‘ivanja i dozvola ekstrahiranih direktorija " "do kraja ekstrakcije" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "poniÅ¡ti utjecaj opcije --delay-directory-restore" -#: src/tar.c:554 +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 #, fuzzy msgid "Handling of extended file attributes:" msgstr "Upravljanje svojstvima datoteka:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" msgstr "" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" msgstr "" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" msgstr "" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" msgstr "" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" msgstr "" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" msgstr "" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" msgstr "" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" msgstr "" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "Odabir i zamjena ureÄ‘aja:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ARHIVA" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "koristi datoteku ili ureÄ‘aj ARHIVA" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "datoteka arhive je lokalna iako sadrži dvotoÄje" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "koristi navedenu rmt NAREDBU umjesto rmt" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "koristi udaljenu NAREDBU umjesto rsh" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "navedi ureÄ‘aj i gustoću" # FIXME -- volume -- find more suitable (ask others) -- TM -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "napravi/ispiÅ¡i/ekstrahiraj viÅ¡edjelnu arhivu" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "promijeni vrpcu nakon zapisivanja BROJ x 1024 bajtova" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "pokreni skriptu na kraju svake vrpce (podrazumijeva -M)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "koristi/ažuriraj broj dijela arhive u DATOTECI" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "Podjela ureÄ‘aja u blokove:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "BLOKOVI" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "BLOKOVI x 512 bajtova po zapisu" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "BROJ bajtova po zapisu, viÅ¡ekratnik 512" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "zanemari blokove u arhivi pretvorene u nulu (znaÄi EOF)" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "ponovo napravi blokove pri Äitanju (za 4.2BSD cjevovode)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "Odabir oblika arhive:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "OBLIK" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "stvori arhivu zadanog oblika" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "OBLIK je jedan od sljedećih:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "stari V7 tar oblik" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "GNU oblik za tar <= 1.12" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x oblik" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) oblik" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) oblik" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "isto kao pax" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "isto kao --format=v7" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "isto kao --format=posix" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "kljuÄna_rijeÄ[[:]=vrijednost][,kljuÄna_rijeÄ[[:]=vrijednost]]..." -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "kontrolne pax kljuÄne rijeÄi" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "TEKST" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1919,169 +1943,181 @@ msgstr "" "Napravi arhivu s imenom dijela arhive TEKST. Pri ispisu/otpakiranju koristi " "TEKST za traženje uzorka za ime dijela arhive." -#: src/tar.c:660 +#: src/tar.c:684 msgid "Compression options:" msgstr "Opcije kompresije:" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "koristi sufiks arhive za odreÄ‘ivanje programa za kompresiju" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "ne koristi sufiks arhive za odreÄ‘ivanje programa za kompresiju" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "PROGRAM" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "filtriraj kroz PROGRAM (mora prihvaćati -d)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "Odabir lokalnih datoteka:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" "dodaj navedenu DATOTEKU u arhivu (korisno ako njeno ime poÄinje crticom)" -#: src/tar.c:687 -msgid "DIR" -msgstr "DIR" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "promijeni u direktorij DIR" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "otkrij imena za otpakiranje ili napravi iz DATOTEKE" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "-T Äita praznim znakom zavrÅ¡ena imena, onemogućuje -C" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "onemogući utjecaj prethodne opcije --null" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" msgstr "ukloni navode imena datoteka proÄitanih s -T (zadano)" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" msgstr "ne uklanjaj navode imena datoteka proÄitanih s -T" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "UZORAK" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "izostavi datoteke koje odgovaraju UZORKU" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "izostavi uzorke navedene u DATOTECI" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" "izostavi sadržaj direktorija koji sadrže CACHEDIR.TAG, osim datoteke oznake" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "izostavi sve unutar direktorija koji sadrže CACHEDIR.TAG" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "izostavi direktorije koji sadrže CACHEDIR.TAG" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "izostavi sadržaj direktorija koji sadrži DATOTEKU osim nje same" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "izostavi sve iz direktorija koji sadrže DATOTEKU" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "izostavi direktorije koji sadrže DATOTEKU" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "izostavi sustavske direktorije kontrole inaÄice" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "izostavi sigurnosne kopije i datoteke zakljuÄavanja" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "izbjegavaj automatsko spuÅ¡tanje u direktorije" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "ostani u lokalnom datoteÄnom sustavu pri stvaranju arhive" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "rekurzivno uÄ‘i u direktorije (zadano)" -#: src/tar.c:729 +#: src/tar.c:761 #, fuzzy msgid "don't strip leading '/'s from file names" msgstr "ne uklanjaj poÄetne „/†iz imena datoteka" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "slijedi simboliÄke veze; arhiviraj i ispiÅ¡i datoteke na koje pokazuju" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "slijedi Ävrste veze; arhiviraj i ispiÅ¡i datoteke na koje se odnose" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "IME-ELEMENTA" -#: src/tar.c:735 +#: src/tar.c:767 #, fuzzy msgid "begin at member MEMBER-NAME when reading the archive" msgstr "zapoÄni s elementom IME-ELEMENTA u arhivi" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "spremi samo datoteke novije od DATUM-ILI-DATOTEKA" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "DATUM" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "usporedi datum i vrijeme samo ako su podaci promijenjeni" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "KONTROLA" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "napravi sigurnosnu kopiju prije uklanjanja, odaberi KONTROLU inaÄice" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "NIZ" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -2089,98 +2125,98 @@ msgstr "" "napravi sigurnosnu kopiju prije uklanjanja, zamijeni uobiÄajeni sufiks („~†" "osim ako je promijenjen varijablom okoline SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "Pretvaranja imena datoteka:" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "ukloni BROJ vodećih komponenti iz imena datoteka pri otpakiranju" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "IZRAZ" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "koristi sed zamjenu IZRAZA za promjenu imena datoteka" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "Opcije podudaranja imena datoteka (utjeÄe na uzorke za iskljuÄivanje i " "ukljuÄivanje):" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "zanemari veliÄinu slova" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "" -#: src/tar.c:767 +#: src/tar.c:799 msgid "patterns match after any '/' (default for exclusion)" msgstr "" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "" -#: src/tar.c:775 +#: src/tar.c:807 #, fuzzy msgid "wildcards do not match '/'" msgstr "Dio arhive %s ne odgovara %s" -#: src/tar.c:777 +#: src/tar.c:809 msgid "wildcards match '/' (default for exclusion)" msgstr "" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Informativni izlaz:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "opÅ¡irno ispiÅ¡i obraÄ‘ene datoteke" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "KLJUÄŒNA_RIJEÄŒ" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "kontrola upozorenja" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "prikaži poruke o napretku svakih BROJ zapisa (zadano 10)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "RADNJA" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "izvrÅ¡i RADNJU na svakoj kontrolnoj toÄki" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "ispiÅ¡i poruku ako nisu ispisane sve veze" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "SIGNAL" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2192,35 +2228,35 @@ msgstr "" "SIGQUIT, SIGINT, SIGUSR1 i SIGUSR2. TakoÄ‘er se prihvaćaju imena bez prefiksa " "SIG." -#: src/tar.c:802 +#: src/tar.c:834 msgid "print file modification times in UTC" msgstr "ispiÅ¡i vremena ureÄ‘ivanja datoteka u UTC-u" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "ispiÅ¡i potpunu rezoluciju vremena datoteke" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "poÅ¡alji opÅ¡iran izlaz u DATOTEKU" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "prikaži broj bloka u arhivi uz svaku poruku" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "traži potvrdu svake radnje" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "prikaži zadane postavke za tar" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2228,32 +2264,32 @@ msgstr "" "pri ispisu ili ekstrakciji, ispiÅ¡i svaki direktorij koji ne odgovara " "uvjetima pretraživanja" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "prikaži imena datoteke ili arhive nakon pretvaranja" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "STIL" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "" "postavi stil navoÄ‘enja imena; pogledajte niže ispravne vrijednosti STILA" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "dodatno navedi znakove iz NIZA" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "onemogući navoÄ‘enje za znakove iz NIZA" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "Opcije kompatibilnosti:" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2261,15 +2297,15 @@ msgstr "" "pri stvaranju, isto kao --old-archive; pri ekstrahiranju, isto kao --no-same-" "owner" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "Ostale opcije:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "onemogući koriÅ¡tenje nekih potencijalno opasnih opcija" -#: src/tar.c:978 +#: src/tar.c:1010 #, fuzzy msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " @@ -2277,40 +2313,40 @@ msgid "" msgstr "" "Ne možete navesti viÅ¡e od jedne od opcija „-Acdtrux†ili „--test-labelâ€" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Konfliktne opcije komprimiranja" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "Nepoznato ime signala: %s" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "Datoteka s primjerom datuma nije pronaÄ‘ena" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Mijenjam %s za nepoznat oblik datuma %s" -#: src/tar.c:1108 +#: src/tar.c:1140 #, fuzzy, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "Opcija %s: Postupam s datumom „%s†kao %s" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "filtriraj arhivu kroz %s" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "Ispravni argumenti opcije --quoting-style su:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2318,48 +2354,48 @@ msgstr "" "\n" "UobiÄajeno ponaÅ¡anje *ovog* programa tar je:\n" -#: src/tar.c:1295 +#: src/tar.c:1330 #, fuzzy msgid "Invalid owner or group ID" msgstr "Neispravan vlasnik" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Neispravan faktor pakiranja u blokove" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "Neispravna duljina vrpce" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "Neispravna vrijednost inkrementalne razine" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "ViÅ¡e od jednog datuma praga" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "Neispravna vrijednost raÅ¡trkane inaÄice" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' nije podržan na ovoj platformi" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "vrijednost --checkpoint nije cjelobrojna" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Neispravan mod naveden opcijom" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "Neispravan broj" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" @@ -2367,70 +2403,68 @@ msgstr "" "Opcija --preserve je zastarjela, koristite --preserve-permissions --preserve-" "order umjesto nje" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "PogreÅ¡na veliÄina zapisa" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "VeliÄina sloga mora biti viÅ¡ekratnik %d." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "Neispravan broj elemenata" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "Dozvoljena je samo jedna opcija --to-command" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "IzobliÄen argument gustoće: %s" -#: src/tar.c:2133 +#: src/tar.c:2205 #, fuzzy, c-format msgid "Unknown density: '%c'" msgstr "Nepoznata gustoća: „%câ€" -#: src/tar.c:2150 +#: src/tar.c:2222 #, fuzzy, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "*Ovaj* tar ne podržava opcije „-[0-7][lmh]â€" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[DATOTEKA]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 +#, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "Uzorak %s se ne može koristiti" + +#: src/tar.c:2389 #, fuzzy, c-format msgid "Old option '%c' requires an argument." msgstr "Stara opcija „%c†zahtijeva argument." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence nema smisla bez popisa datoteka" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "--occurrence se ne može koristiti u traženom naÄinu rada" - -#: src/tar.c:2408 +#: src/tar.c:2490 #, fuzzy msgid "Multiple archive files require '-M' option" msgstr "ViÅ¡edjelne arhive zahtijevaju opciju „-Mâ€" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "Ne mogu kombinirati --listed-incremental s --newer" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "--level nema smisla bez --listed-incremental" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" @@ -2438,80 +2472,76 @@ msgstr[0] "%s: Oznaka dijela arhive je predugaÄka (ograniÄenje je %lu bajt)" msgstr[1] "%s: Oznaka dijela arhive je predugaÄka (ograniÄenje je %lu bajta)" msgstr[2] "%s: Oznaka dijela arhive je predugaÄka (ograniÄenje je %lu bajtova)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Ne mogu provjeriti viÅ¡edjelne arhive" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Ne mogu provjeriti komprimirane arhive" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "Uzorak %s se ne može koristiti" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Ne mogu koristiti viÅ¡edjelne komprimirane arhive" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "Ne mogu spojiti komprimirane arhive" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option se može koristiti samo na POSIX arhivama" -#: src/tar.c:2478 +#: src/tar.c:2560 #, fuzzy msgid "--acls can be used only on POSIX archives" msgstr "--pax-option se može koristiti samo na POSIX arhivama" -#: src/tar.c:2483 +#: src/tar.c:2565 #, fuzzy msgid "--selinux can be used only on POSIX archives" msgstr "--pax-option se može koristiti samo na POSIX arhivama" -#: src/tar.c:2488 +#: src/tar.c:2570 #, fuzzy msgid "--xattrs can be used only on POSIX archives" msgstr "--pax-option se može koristiti samo na POSIX arhivama" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "Uzorak %s se ne može koristiti" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" +msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "Duljina dijela arhive ne može biti manja od veliÄine zapisa" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "--preserve-order nije kompatibilno s --listed-incremental" - # LOL -- TM -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "KukaviÄki odbijam napraviti praznu arhivu" -#: src/tar.c:2565 +#: src/tar.c:2669 #, fuzzy msgid "Options '-Aru' are incompatible with '-f -'" msgstr "Opcije „-Aru†nisu kompatibilne s „-f -â€" -#: src/tar.c:2660 +#: src/tar.c:2766 #, fuzzy msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" msgstr "Morate navesti jednu od opcija „-Acdtrux†ili „--test-labelâ€" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "Izlazim sa stanjem neuspjeha zbog prethodnih greÅ¡aka" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" @@ -2520,52 +2550,52 @@ msgstr[0] "%s: Datoteka skraćena za %s bajt" msgstr[1] "%s: Datoteka skraćena za %s bajta" msgstr[2] "%s: Datoteka skraćena za %s bajtova" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "KljuÄna rijeÄ %s je nepoznata ili joÅ¡ nije implementirana" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" msgstr "Vremenska oznaka je izvan dozvoljenih granica" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "Uzorak %s se ne može koristiti" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "KljuÄnu rijeÄ %s se ne može zaobići" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "IzobliÄeno proÅ¡ireno zaglavlje: nedostaje duljina" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "Duljina proÅ¡irenog zaglavlja %*s je izvan granica" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "IzobliÄeno proÅ¡ireno zaglavlje: nedostaje praznina nakon duljine" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "IzobliÄeno proÅ¡ireno zaglavlje: nedostaje znak jednakosti" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "IzobliÄeno proÅ¡ireno zaglavlje: nedostaje novi redak" -#: src/xheader.c:740 +#: src/xheader.c:741 #, fuzzy, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "Zanemarujem nepoznatu kljuÄnu rijeÄ proÅ¡irenog zaglavlja „%sâ€" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" @@ -2574,48 +2604,48 @@ msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "ProÅ¡ireno zaglavlje %s=%s je izvan raspona %s..%s" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "IzobliÄeno proÅ¡ireno zaglavlje: neispravan %s=%s" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "IzobliÄeno proÅ¡ireno zaglavlje: suviÅ¡an %s=%s" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" "IzobliÄeno proÅ¡ireno zaglavlje: neispravan %s: neoÄekivan znak razdvajanja %c" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" "IzobliÄeno proÅ¡ireno zaglavlje: neispravan %s: neparan broj vrijednosti" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "%s: nije ispravno vremensko ograniÄenje" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "%s: nepoznata radnja kontrolne toÄke" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "piÅ¡i" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "Äitaj" @@ -2623,7 +2653,7 @@ msgstr "Äitaj" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "Kontrolna toÄka pisanja %u" @@ -2632,7 +2662,7 @@ msgstr "Kontrolna toÄka pisanja %u" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "Kontrolna toÄka Äitanja %u" @@ -2894,12 +2924,19 @@ msgstr "Naredba zavrÅ¡ena\n" msgid "--stat requires file names" msgstr "--stat zahtijeva imena datoteka" -#~ msgid "Cannot get working directory" -#~ msgstr "Ne mogu saznati trenutni radni direktorij" - #~ msgid "sort names to extract to match archive" #~ msgstr "razvrstaj imena za ekstrakciju da odgovaraju arhivi" +#, fuzzy +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "--occurrence se ne može koristiti u traženom naÄinu rada" + +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "Ne mogu kombinirati --listed-incremental s --newer" + +#~ msgid "--preserve-order is not compatible with --listed-incremental" +#~ msgstr "--preserve-order nije kompatibilno s --listed-incremental" + #~ msgid "Field too long while reading snapshot file" #~ msgstr "Polje predugaÄko pri Äitanju datoteke snimke stanja" @@ -2909,6 +2946,9 @@ msgstr "--stat zahtijeva imena datoteka" #~ msgid "Unexpected field value in snapshot file" #~ msgstr "NeoÄekivana vrijednost polja u datoteci snimke stanja" +#~ msgid "Cannot get working directory" +#~ msgstr "Ne mogu saznati trenutni radni direktorij" + #~ msgid "Invalid group" #~ msgstr "Neispravna grupa" diff --git a/po/hu.gmo b/po/hu.gmo index efb9c1a..60bcb45 100644 Binary files a/po/hu.gmo and b/po/hu.gmo differ diff --git a/po/hu.po b/po/hu.po index fb23d9f..3d219bc 100644 --- a/po/hu.po +++ b/po/hu.po @@ -3,21 +3,21 @@ # This file is distributed under the same license as the tar package. # # Gábor István , 2002. -# Gabor Kelemen , 2006, 2007, 2008, 2009, 2010. -#: src/create.c:1572 +# Gabor Kelemen , 2006, 2007, 2008, 2009, 2010, 2014. +#: src/create.c:1574 msgid "" msgstr "" -"Project-Id-Version: tar 1.24\n" +"Project-Id-Version: tar 1.27\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" -"PO-Revision-Date: 2010-10-25 14:41+0200\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" +"PO-Revision-Date: 2014-04-04 20:22+0200\n" "Last-Translator: Gabor Kelemen \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" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: gnu/argmatch.c:135 @@ -80,7 +80,7 @@ msgid " [OPTION...]" msgstr " [KAPCSOLÓ...]" #: gnu/argp-help.c:1686 -#, fuzzy, c-format +#, c-format msgid "Try '%s --help' or '%s --usage' for more information.\n" msgstr "" "További információkért próbálja kiadni a „%s --help†vagy „%s --usage†" @@ -103,7 +103,7 @@ msgstr "ezen súgószöveg megjelenítése" msgid "give a short usage message" msgstr "rövid használati utasítás megjelenítése" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "NÉV" @@ -142,9 +142,9 @@ msgid "write error" msgstr "íráshiba" #: gnu/getopt.c:549 gnu/getopt.c:578 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: a(z) „%s†kapcsoló nem egyértelmű\n" +msgstr "%s: a(z) „%s†kapcsoló nem egyértelmű, lehetÅ‘ségek:" #: gnu/getopt.c:626 gnu/getopt.c:630 #, c-format @@ -438,7 +438,7 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: a következÅ‘ függvény meghiúsult: %s" @@ -447,34 +447,34 @@ msgstr "%s: a következÅ‘ függvény meghiúsult: %s" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: Figyelmeztetés: a következÅ‘ függvény meghiúsult: %s" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: Nem lehet %s módba váltani" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: Nem módosítható a tulajdonos uid-ja %lu, gid-je %lu értékekre" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: Nem hozható létre közvetlen link a következÅ‘re: %s" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Olvasási hiba a(z) %s. bájtnál, %lu bájt beolvasása közben" msgstr[1] "%s: Olvasási hiba a(z) %s. bájtnál, %lu bájt beolvasása közben" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" @@ -485,22 +485,22 @@ msgstr[1] "" "%s: Figyelmeztetés: Olvasási hiba a(z) %s. bájtnál, %lu bájt beolvasása " "közben" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: Nem lehet a(z) %s helyre pozicionálni" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: Figyelmeztetés: Nem lehet a(z) %s helyre pozicionálni" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: Nem hozható létre szimbolikus link a következÅ‘re: %s" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -546,9 +546,9 @@ msgid "Cannot connect to %s: resolve failed" msgstr "Nem lehet csatlakozni ehhez: %s: a feloldás meghiúsult" #: lib/rtapelib.c:502 -#, fuzzy, c-format +#, c-format msgid "Cannot redirect files for remote shell" -msgstr "Nem futtatható távoli parancssor" +msgstr "Nem irányíthatók át fájlok a távoli parancssorhoz" #: lib/rtapelib.c:516 #, c-format @@ -600,8 +600,8 @@ msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "" "Szalagos meghajtó manipulálása, parancsok elfogadása távoli folyamattól" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "SZÃM" @@ -609,10 +609,10 @@ msgstr "SZÃM" msgid "set debug level" msgstr "hibakeresési szint beállítása" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "FÃJL" @@ -634,105 +634,113 @@ msgstr "túl sok argumentum" msgid "Garbage command" msgstr "Értelmetlen parancs" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Ez nem úgy néz ki, mint egy tar archívum" -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" -msgstr "Kiírt bájtok teljes száma" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" msgstr "Olvasott bájtok teljes száma" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "Kiírt bájtok teljes száma" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Törölt bájtok teljes száma: %s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(csÅ‘)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "A record_size értéke érvénytelen" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Nem adott meg archívumnevet" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Nem ellenÅ‘rizhetÅ‘ az archívum, ha a szabványos be/kimenetet használja" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Az archívum tömörített. Használja a(z) %s kapcsolót." -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Tömörített archívumok nem frissíthetÅ‘k" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "A szalag eleje, most kilépek" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "Túl sok hiba, kilépek" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Rekordméret = %lu blokk" msgstr[1] "Rekordméret = %lu blokk" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "Kitöltetlen blokk (%lu bájt) az archívumban" msgstr[1] "Kitöltetlen blokk (%lu bájt) az archívumban" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" "Nem törölhetÅ‘ vissza az archív fájl, lehet hogy olvashatatlan lesz a -i " "nélkül" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "az rmtlseek nem állt meg egy rekord határán" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: érvénytelen kötetszámot tartalmaz" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "Kötetszám-túlcsordulás" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Készítse elÅ‘ a(z) %d kötetet %s számára és üssön entert:" -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "Fájlvége a várt felhasználói válasz helyett" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "FIGYELMEZTETÉS: Az archívum befejezetlen" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -743,67 +751,67 @@ msgstr "" " q A Tar megszakítása\n" " y vagy újsor A művelet folytatása\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Új parancsértelmezÅ‘ hívása\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? Ezen lista kiírása\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Nincs új kötet, kilépés.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "Nincs megadva fájlnév, próbálkozzon újra.\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Érvénytelen bemenet. A súgó a ? beírásával kérhetÅ‘ le.\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "A(z) „%s†parancs meghiúsult" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" "%s lehetséges, hogy ezen a köteten folytatódott: a fejléc csonkolt nevet " "tartalmaz" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s nem folytatódik ezen a köteten" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s mérete hibás (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Ez a kötet kívül esik a sorozaton (%s - %s != %s)" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "Az archívum nincs úgy címkézve, hogy megfeleljen a következÅ‘höz: %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "A(z) %s kötet nem felel meg a következÅ‘nek: %s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -811,7 +819,7 @@ msgstr "" "%s: a fájlnév túl hosszú egy GNU többkötetes fejlécben való tároláshoz, " "csonkításra került" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "az írás nem egy rekord határán fejezÅ‘dött be" @@ -822,16 +830,16 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Csak %lu bájt olvasható %lu bájtból" msgstr[1] "Csak %lu bájt olvasható %lu bájtból" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "A tartalom eltér" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "Váratlan fájlvége jel az archívumban" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "A fájltípus eltér" @@ -851,7 +859,7 @@ msgstr "A Gid eltér" msgid "Mod time differs" msgstr "A módosítási idÅ‘ eltér" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "A méret eltér" @@ -868,39 +876,38 @@ msgstr "A szimbolikus link eltér" msgid "Device number differs" msgstr "Az eszközszám eltér" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "EllenÅ‘rzés " -#: src/compare.c:471 -#, fuzzy, c-format +#: src/compare.c:473 +#, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "" "%s: A(z) „%c†fájltípus ismeretlen, a diffelés normális fájlként történt" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "Az archívum eltávolított elÅ‘tagokkal rendelkezÅ‘ fájlneveket tartalmaz." -#: src/compare.c:533 -#, fuzzy +#: src/compare.c:535 msgid "Archive contains transformed file names." -msgstr "Az archívum elavulófélben levÅ‘ base-64-es fejléceket tartalmaz" +msgstr "Az archívum átalakított fájlneveket tartalmaz." -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "" "Lehetséges, hogy az ellenÅ‘rzés nem fogja megtalálni az eredeti fájlokat." -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "AZ ELLENÅRZÉS SIKERTELEN: %d érvénytelen fejléc található" msgstr[1] "AZ ELLENÅRZÉS SIKERTELEN: %d érvénytelen fejléc található" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "Egy magányos nulla blokk %s helyen" @@ -948,55 +955,55 @@ msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "%s: a fájl zsugorítva %s bájtra, nullákkal kerül kitöltésre" msgstr[1] "%s: a fájl zsugorítva %s bájtra, nullákkal kerül kitöltésre" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: a fájl eltérÅ‘ fájlrendszeren van, nem kerül kiírásra" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "a tartalom nem került kiírásra" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Ismeretlen fájltípus, fájl a figyelmen kívül hagyva" -#: src/create.c:1549 +#: src/create.c:1551 #, c-format msgid "Missing links to %s." msgstr "Hiányzó linkek a következÅ‘re: „%sâ€." -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: a fájl változatlan, nem kerül kiírásra" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: a fájl az archívumban van, nem kerül kiírásra" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "a könyvtár nem került kiírásra" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: a fájl módosult olvasás közben" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: a foglalat figyelmen kívül hagyva" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: ajtó figyelmen kívül hagyva" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Ugrás a következÅ‘ fejlécre" @@ -1022,7 +1029,7 @@ msgstr "%s: Váratlan inkonzisztencia a könyvtár létrehozása során" #: src/extract.c:705 #, c-format msgid "%s: skipping existing file" -msgstr "" +msgstr "%s: meglévÅ‘ fájl kihagyása" #: src/extract.c:821 #, c-format @@ -1042,12 +1049,12 @@ msgstr "Kísérlet a szimbolikus linkek kibontására közvetlen linkként" msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: nem lehet kibontani -- a fájl egy másik köteten folytatódik" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" msgstr "Váratlan hosszú névfejléc" #: src/extract.c:1542 -#, fuzzy, c-format +#, c-format msgid "%s: Unknown file type '%c', extracted as normal file" msgstr "%s: Ismeretlen fájltípus: „%câ€, normál fájlként lesz kibontva" @@ -1077,170 +1084,171 @@ msgid "%s: Directory is new" msgstr "%s: a könyvtár új" #: src/incremen.c:566 -#, fuzzy, c-format +#, c-format msgid "%s: directory is on a different filesystem; not dumped" -msgstr "%s: a fájl eltérÅ‘ fájlrendszeren van, nem kerül kiírásra" +msgstr "%s: a könyvtár eltérÅ‘ fájlrendszeren van, nem kerül kiírásra" #: src/incremen.c:587 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: a könyvtár át lett nevezve" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "Érvénytelen idÅ‘bélyeg" -#: src/incremen.c:1045 -#, fuzzy +#: src/incremen.c:1047 msgid "Invalid modification time" -msgstr "Érvénytelen módosítási idÅ‘ (másodperc)" +msgstr "Érvénytelen módosítási idÅ‘" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "Érvénytelen módosítási idÅ‘ (nanomásodperc)" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "Érvénytelen eszközszám" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Érvénytelen inode-szám" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" -msgstr "" +msgstr "%s: %s bájt: %s %.*s... túl hosszú" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" msgstr "Váratlan fájlvége a pillanatképfájlban" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" -msgstr "" +msgstr "%s: %s bájt: %s %s után érvénytelen bájt áll: 0x%02x" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" +"%s: %s bájt: (érvényes tartomány: %s..%s)\n" +"\t%s %s" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" -msgstr "" +msgstr "%s: %s bájt: %s %s" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" -msgstr "" +msgstr "%s: %s bájt: %s" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "Hiányzó rekordlezáró" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "Hibás növekményes fájlformátum" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "Nem támogatott növekményes formátumverzió: %" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" "Rosszul formázott kiíratási könyvtár: a várt „%c†helyett %#3o található" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Rosszul formázott kiíratási könyvtár: az „X†többször szerepel" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Rosszul formázott kiíratási könyvtár: üres név az „Râ€-ben" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Rosszul formázott kiíratási könyvtár: a „Tâ€-t nem elÅ‘zi meg az „Râ€" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Rosszul formázott kiíratási könyvtár: üres név a „Tâ€-ben" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" "Rosszul formázott kiíratási könyvtár: a várt „%c†helyett az adatok vége " "található" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "" "Rosszul formázott kiíratási könyvtár: az „X†soha nem került felhasználásra" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "" "Nem hozható létre ideiglenes könyvtár a következÅ‘ sablon használatával: %s" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: a könyvtár nem kerül törlésre: nem érhetÅ‘ el" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: a fájl egy másik eszközön van: nem kerül törlésre" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s törlése\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: nem távolítható el" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: kihagyás" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "blokk %s: ** A blokk üres **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "blokk %s: ** Fájlvége **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "blokk %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "" "Ãœres értékek a fejléc azon részében, ahol a program a(z) %s számértéket várta" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1248,125 +1256,124 @@ msgstr "" "feltételezi, hogy kettes komplemens" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Az archívum %.*s oktális értéke túllépi a(z) %s tartományt" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "Az archívum elavulófélben levÅ‘ base-64-es fejléceket tartalmaz" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" "Az archívum elÅ‘jeles base-64 karakterlánca (%s) túllépi a(z) %s tartományt" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Az archívum base-256-os értéke túllépi a(z) %s tartományt" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Az archívum %.*s értéket tartalmaz, ahol a program %s számértéket vár" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Az archívum %s értéke túllépi a(z) %s %s..%s tartományát" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " link a következÅ‘re: %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " ismeretlen fájltípus: %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--Hosszú link--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--Hosszú név--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Kötetfejléc--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Folytatva %s bájttól--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Könyvtár létrehozása:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "%s átnevezése a következÅ‘re: %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Nem nevezhetÅ‘ át a következÅ‘re: %s" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "%s helyreállítása a következÅ‘ névre: %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: a fájl el lett távolítva a beolvasás elÅ‘tt" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "gyermekfolyamat" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "folyamatközi csatorna" #: src/names.c:360 -#, fuzzy msgid "command line" -msgstr "A(z) „%s†parancs meghiúsult" +msgstr "parancssor" #: src/names.c:378 -#, fuzzy, c-format +#, c-format msgid "%s: file list requested from %s already read from %s" -msgstr "%s: a fájllista már be van olvasva" +msgstr "%s: a(z) %s helyrÅ‘l kért fájllista már be van olvasva innen: %s" -#: src/names.c:448 -#, fuzzy, c-format +#: src/names.c:448 src/checkpoint.c:274 +#, c-format msgid "cannot split string '%s': %s" -msgstr "nem állítható be az idÅ‘ a következÅ‘n: „%sâ€" +msgstr "nem darabolható a(z) „%s†karakterlánc: %s" #: src/names.c:490 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: a beolvasott fájlnév null karaktert tartalmaz" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "MintaillesztÅ‘ karaktereket használt a fájlnevekben" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1374,57 +1381,56 @@ msgstr "" "Használja a --wildcards kapcsolót a mintaillesztés engedélyezéséhez, vagy a " "--no-wildcards kapcsolót ezen figyelmeztetés letiltásához" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: Nem található az archívumban" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: A szükséges elÅ‘fordulás nem található az archívumban" -#: src/names.c:876 +#: src/names.c:879 #, c-format msgid "Archive label mismatch" msgstr "Hibás archívumcímke" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "A -C használata fájllistán belül nem engedélyezett a --listed-incremental " "kapcsolóval" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Csak egy -C engedélyezett a --listed-incremental kapcsolóval" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "" "A(z) „-%s†és a(z) „-%s†kapcsolók mind a szabványos bemenetet igénylik" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s: Érvénytelen archívumformátum" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "GNU szolgáltatásokat kértél inkompatibilis az archívumformátumokon" -#: src/tar.c:255 -#, fuzzy, c-format +#: src/tar.c:264 +#, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." msgstr "" "A(z) „%s†idézési stílus ismeretlen. Próbálja a „%s --quoting-style=help†" "parancsot segítségért." -#: src/tar.c:364 -#, fuzzy +#: src/tar.c:378 msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1440,13 +1446,12 @@ msgstr "" "Például:\n" " tar -cf archívum.tar foo bar # Létrehozza az archívum.tar fájlt a foo\n" " és bar fájlokból.\n" -" tar -tvf archívum.tar # BÅ‘beszédűen felsorolja az archívum.tar\n" +" tar -tvf archívum.tar # Részletesen felsorolja az archívum.tar\n" " fájljait.\n" " tar -xf archívum.tar # Kibontja az összes fájlt az archívum.tar\n" " fájlból.\n" -#: src/tar.c:373 -#, fuzzy +#: src/tar.c:387 msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" "The version control may be set with --backup or VERSION_CONTROL, values " @@ -1468,81 +1473,81 @@ msgstr "" " egyébként egyszerű\n" " never, simple mindig egyszerű mentés létrehozása\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "FÅ‘ működési mód:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "felsorolja egy archívum tartalmát" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "fájlok kibontása egy archívumból" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "új archívum létrehozása" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "különbségek keresése az archívum és a fájlrendszer között" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "fájlok hozzáfűzése egy archívum végéhez" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "csak az archívumban lévÅ‘ másolatnál újabb fájlok hozzáfűzése" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "tar fájlok hozzáfűzése egy archívumhoz" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "törlés az archívumból (szalagon nem működik!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "az archívum kötetcímkéjének tesztelése és kilépés" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "Műveletmódosítók:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "ritka fájlok hatékony kezelése" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "MAGAS[.ALACSONY]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" "a használandó ritka formátum verziójának beállítása (magával vonja\n" " a --sparse kapcsolót)" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "régi GNU formátumú növekményes mentés kezelése" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "új GNU formátumú növekményes mentés kezelése" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "kiíratási szint a létrehozott listázott növekményes archívumhoz" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "ne lépjen ki nem nulla értékkel ha a fájl olvashatatlan" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1555,133 +1560,139 @@ msgstr "" "átadásra a parancssoron vagy a -T kapcsolón keresztül. A SZÃM " "alapértelmezett értéke az 1." -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "az archívum kereshetÅ‘" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "az archívumban nem lehet pozicionálni" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "ne ellenÅ‘rizze az eszközszámokat növekményes archívumok létrehozásakor" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" "eszközszámok ellenÅ‘rzése növekményes archívumok létrehozásakor " "(alapértelmezett)" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "Felülírás felügyelete:" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "kísérlet az archívum ellenÅ‘rzésére annak kiírása után" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "fájlok eltávolítása azok archívumhoz adása után" -#: src/tar.c:471 -#, fuzzy +#: src/tar.c:485 msgid "don't replace existing files when extracting, treat them as errors" -msgstr "ne cserélje a meglévÅ‘ fájlokat kibontáskor" +msgstr "ne cserélje a meglévÅ‘ fájlokat kibontáskor, kezelje ezeket hibaként" -#: src/tar.c:474 -#, fuzzy +#: src/tar.c:488 msgid "don't replace existing files when extracting, silently skip over them" -msgstr "ne cserélje a meglévÅ‘ fájlokat kibontáskor" +msgstr "" +"ne cserélje a meglévÅ‘ fájlokat kibontáskor, szó nélkül hagyja ki ezeket" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "ne cserélje az archív változatuknál újabb meglévÅ‘ fájlokat" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "meglévÅ‘ fájlok felülírása kibontáskor" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "minden egyes fájl eltávolítása a rá történÅ‘ kibontás elÅ‘tt" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "hierarchiák kiürítése könyvtár kibontása elÅ‘tt" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "meglévÅ‘ könyvtárak metaadatainak megÅ‘rzése" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "meglévÅ‘ könyvtárak metaadatainak felülírása kibontáskor (alapértelmezett)" -#: src/tar.c:490 -#, fuzzy +#: src/tar.c:504 msgid "preserve existing symlinks to directories when extracting" -msgstr "meglévÅ‘ fájlok felülírása kibontáskor" +msgstr "könyvtárakra mutató meglévÅ‘ szimlinkek megÅ‘rzése kibontáskor" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "KÖNYVTÃR" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "Kimeneti adatfolyam kiválasztása:" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "fájlok kibontása a szabványos kimenetre" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "PARANCS" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "kibontott fájlok továbbítása másik program számára" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "utódok kilépési kódjainak figyelmen kívül hagyása" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "az utódok nem nulla kilépési kódjainak kezelése hibaként" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Fájlattribútumok kezelése:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "a NÉV kényszerítése a hozzáadott fájlok tulajdonosaként" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "a NÉV kényszerítése a hozzáadott fájlok csoportjaként" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "DÃTUM-VAGY-FÃJL" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "a DÃTUM-VAGY-FÃJL dátumnál újabb fájlok mtime értékének beállítása" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "MÓDOSÃTÃSOK" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "a (szimbolikus) mód módosítások kényszerítése a hozzáadott fájlokra" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "MÓDSZER" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " @@ -1691,11 +1702,11 @@ msgstr "" "olvasás után történÅ‘ visszaállításával (MÓDSZER='replace'; alapértelmezett) " "vagy az idÅ‘pontok be nem állításával az elsÅ‘ helyen (MÓDSZER='system')" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "ne bontsa ki a fájl módosításának idÅ‘pontját" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" @@ -1703,22 +1714,22 @@ msgstr "" "próbálja az archívumban létezÅ‘vel azonos tulajdonossal kibontani a fájlokat " "(alapértelmezett a rendszergazdának)" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "" "fájlok kibontása a saját nevében (alapértelmezett normál felhasználóknak)" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "mindig számok használata a felhasználó- vagy csoportnevekhez" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" "a fájl jogosultságaival kapcsolatos információk kibontása (alapértelmezett a " "rendszergazda számára)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1726,16 +1737,18 @@ msgstr "" "a felhasználó umask értékének alkalmazása a jogosultságok kibontásakor az " "archívumból (alapértelmezett az egyszerű felhasználók számára)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" +"a tagargumentumok ugyanabban a sorrendben kerülnek felsorolásra, mint az " +"archívum fájljai" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "azonos, mint a -p és -s egyszerre" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1743,180 +1756,187 @@ msgstr "" "kibontott könyvtárak módosítási idÅ‘i és jogosultságai beállításának " "késleltetése a kibontás befejeztéig" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "a --delay-directory-restore kapcsoló hatásának megszüntetése" -#: src/tar.c:554 -#, fuzzy +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 msgid "Handling of extended file attributes:" -msgstr "Fájlattribútumok kezelése:" +msgstr "Kiterjesztett fájlattribútumok kezelése:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" -msgstr "" +msgstr "Kiterjesztett attribútumok támogatásának engedélyezése" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" -msgstr "" +msgstr "Kiterjesztett attribútumok támogatásának kikapcsolása" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" -msgstr "" +msgstr "MASZK" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" -msgstr "" +msgstr "Adja meg az xattr kulcsok felvételi mintáját" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" -msgstr "" +msgstr "Adja meg az xattr kulcsok kihagyási mintáját" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" -msgstr "" +msgstr "A SELinux kontextustámogatás bekapcsolása" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" -msgstr "" +msgstr "A SELinux kontextustámogatás kikapcsolása" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" -msgstr "" +msgstr "A POSIX ACL-ek támogatásának bekapcsolása" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" -msgstr "" +msgstr "A POSIX ACL-ek támogatásának kikapcsolása" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "Eszköz kiválasztása és váltása:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ARCHÃVUM" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "az ARCHÃVUM archívumfájl vagy -eszköz használata" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "az archívumfájl helyi, még ha tartalmaz is kettÅ‘spontot" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "az adott rmt PARANCS használata az rmt helyett" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "a távoli PARANCS használata az rsh helyett" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "meghajtó és sűrűség megadása" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "többkötetes archívum létrehozása/listázása/kibontása" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "szalagváltás a SZÃM x 1024 bájt kiírása után" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "parancsfájl futtatása minden egyes szalag végén (-M esetén)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "a FÃJLBAN található számú kötet használata/frissítése" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "Eszközblokkolás:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "BLOKK" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "rekordonként BLOKK x 512 bájt" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "SZÃM bájt rekordonként, az 512 többszöröse" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "nullázott blokkok (EOF) mellÅ‘zése az archívumban" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "újrablokkolás olvasáskor (4.2BSD csövekhez)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "Archívumformátum kiválasztása:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "FORMÃTUM" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "az adott formátumú archívum létrehozása" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "A FORMÃTUM a következÅ‘k egyike:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "régi V7 tar formátum" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "A tar <= 1.12 által használt GNU formátum" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x formátum" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) formátum" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) formátum" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "azonos a pax formátummal" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "azonos a --format=v7 formátummal" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "azonos a --format=posix formátummal" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "kulcsszó[[:]=érték][,kulcsszó[[:]=érték]..." -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "a pax kulcsszavak irányítása" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "SZÖVEG" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1924,80 +1944,78 @@ msgstr "" "archívum létrehozása a SZÖVEG kötetnévvel. Listázáskor vagy kibontáskor " "használja a kötetnév keresési mintájaként a SZÖVEGET" -#: src/tar.c:660 +#: src/tar.c:684 msgid "Compression options:" msgstr "Tömörítési kapcsolók:" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "archívum kiterjesztésének használata a tömörítÅ‘program meghatározására" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "" "ne használja az archívum kiterjesztését a tömörítÅ‘program meghatározására" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "PROG" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "tömörítése a PROG használatával (el kell fogadnia a -d kapcsolót)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "Helyi fájlválasztás:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" "az adott FÃJL hozzáadása az archívumhoz (hasznos, ha neve kötÅ‘jellel " "kezdÅ‘dik)" -#: src/tar.c:687 -msgid "DIR" -msgstr "KÖNYVTÃR" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "váltás a KÖNYVTÃR könyvtárba" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "kibontandó nevek lekérdezése vagy létrehozás a FÃJLBÓL" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "a -T nullal lezárt neveket olvas, letiltja a -C kapcsolót" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "a korábbi --null kapcsoló hatásának letiltása" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" msgstr "" "a -T segítségével beolvasott fájlnevek idézettségének megszüntetése " "(alapértelmezett)" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" msgstr "ne szüntesse meg a -T segítségével beolvasott fájlnevek idézettségét" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "MINTA" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "a MINTAKÉNT megadott fájlok kihagyása" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "a FÃJLBAN megadott minták kihagyása" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -2005,98 +2023,110 @@ msgstr "" "a CACHEDIR.TAG-et tartalmazó könyvtárak tartalmának kihagyása, a címkefájl " "kivételével" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "a CACHEDIR.TAG-et tartalmazó könyvtárak alatt minden kihagyása" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "a CACHEDIR.TAG-et tartalmazó könyvtárak kihagyása" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" "a FÃJLT tartalmazó könyvtárak tartalmának kihagyása, a FÃJL kivételével" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "a FÃJLT tartalmazó könyvtárak alatt minden kihagyása" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "a FÃJLT tartalmazó könyvtárak kihagyása" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "verziókezelÅ‘-könyvtárak kihagyása" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "mentési és zárolási fájlok kihagyása" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "ne lépjen be automatikusan a könyvtárakba" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "az archívum létrehozásakor maradjon a helyi fájlrendszeren" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "belépés a könyvtárakba rekurzívan (alapértelmezett)" -#: src/tar.c:729 -#, fuzzy +#: src/tar.c:761 msgid "don't strip leading '/'s from file names" msgstr "ne vágja le a kezdÅ‘ „/†jelet a fájlnevekbÅ‘l" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "" "szimbolikus linkek követése; az általuk mutatott fájlok archiválása és " "kiíratása" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "" "közvetlen linkek követése; az általuk mutatott fájlok archiválása és " "kiíratása" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "TAGNÉV" -#: src/tar.c:735 -#, fuzzy +#: src/tar.c:767 msgid "begin at member MEMBER-NAME when reading the archive" -msgstr "kezdés a TAGNÉV tagnál az archívumban" +msgstr "kezdés a TAGNÉV tagnál az archívum olvasásakor" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "csak a DÃTUM-VAGY-FÃJL dátumnál újabb fájlok tárolása" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "DÃTUM" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "dátum és idÅ‘ összehasonlítása ha csak a dátum módosult" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "FELÃœGYELET" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "mentés eltávolítás elÅ‘tt, a FELÃœGYELET verzió kiválasztása" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "KARAKTERLÃNC" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -2104,105 +2134,102 @@ msgstr "" "mentés eltávolítás elÅ‘tt, a szokásos utótag („~â€, hacsak a " "SIMPLE_BACKUP_SUFFIX környezeti változó nem bírálja felül) felülbírálása" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "Fájlnév-átalakítások:" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "a fájlnevek SZÃM darab kezdÅ‘ összetevÅ‘jének levágása kibontáskor" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "KIFEJEZÉS" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "" "A KIFEJEZÉS sed helyettesítÅ‘kifejezés használata fájlnevek átalakítására" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "Fájlnévillesztés beállításai (érintik mind a kihagyási, mind a felvételi " "mintákat):" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "kis- és nagybetűk figyelmen kívül hagyása" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "a minták illesztése a fájlnevek elejére" -#: src/tar.c:767 -#, fuzzy +#: src/tar.c:799 msgid "patterns match after any '/' (default for exclusion)" -msgstr "a minták illesztése bármely / után (alapértelmezett kihagyáskor)" +msgstr "a minták illesztése bármely „/†után (alapértelmezett kihagyáskor)" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "kis- és nagybetűkre érzékeny illesztés (alapértelmezett)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "helyettesítÅ‘ karakterek használata (alapértelmezett kihagyáskor)" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "szó szerinti karakterlánc-illesztés" -#: src/tar.c:775 -#, fuzzy +#: src/tar.c:807 msgid "wildcards do not match '/'" -msgstr "a helyettesítÅ‘ karakterek nem illeszkednek a perjelre" +msgstr "a helyettesítÅ‘ karakterek nem illeszkednek a „/†jelre" -#: src/tar.c:777 -#, fuzzy +#: src/tar.c:809 msgid "wildcards match '/' (default for exclusion)" msgstr "" -"a helyettesítÅ‘karakterek illeszkednek a „/†jelre (alapértelmezett " +"a helyettesítÅ‘ karakterek illeszkednek a „/†jelre (alapértelmezett " "kihagyáskor)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Informatív kimenet:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "feldolgozott fájlok bÅ‘beszédű listázása" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "KULCSSZÓ" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "figyelmeztetés felügyelete" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" "elÅ‘rehaladási üzenetek megjelenítése minden SZÃM. rekordnál (alapértelmezés: " "10)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "MÅ°VELET" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "a MÅ°VELET végrehajtása minden ellenÅ‘rzÅ‘ponton" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "üzenet kiírása, ha nem minden link került kiíratásra" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "SZIGNÃL" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2214,35 +2241,35 @@ msgstr "" "Az engedélyezett szignálok: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 és SIGUSR2; a " "SIG elÅ‘tag nélküli nevek is elfogadottak" -#: src/tar.c:802 +#: src/tar.c:834 msgid "print file modification times in UTC" msgstr "a fájlmódosítási idÅ‘k kiírása UTC szerint" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" -msgstr "fájl módosítási idejének kíiírása teljes pontossággal" +msgstr "fájl módosítási idejének kiírása teljes pontossággal" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "bÅ‘beszédű kimenet küldése a FÃJLBA" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "az archívumon belüli blokkszám megjelenítése minden egyes üzenettel" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "megerÅ‘sítés kérése minden egyes művelethez" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "a tar alapértelmezéseinek megjelenítése" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" -msgstr "" +msgstr "érvényes tartományok megjelenítése a pillanatkép-fájl mezÅ‘khöz" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2250,31 +2277,31 @@ msgstr "" "listázáskor vagy kibontáskor minden egyes, a keresési feltételnek meg nem " "felelÅ‘ könyvtár listázása" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "fájl- vagy archívumnevek megjelenítése átalakítás után" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "STÃLUS" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "az idézési stílus beállítása, az érvényes STÃLUS értékeket lásd alább" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "a KARAKTERLÃNCBÓL származó karakterek kiegészítÅ‘ idézése" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "a KARAKTERLÃNCBÓL származó karakterek idézésének letiltása" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "Kompatibilitási kapcsolók:" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2282,57 +2309,56 @@ msgstr "" "létrehozáskor megegyezik a --old-archive kapcsolóval; kibontáskor a --no-" "same-owner kapcsolóval" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "Egyéb kapcsolók:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "néhány potenciálisan káros kapcsoló használatának letiltása" -#: src/tar.c:978 -#, fuzzy +#: src/tar.c:1010 msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" msgstr "" -"A következÅ‘ kapcsolók közül egynél többet nem használhat: „-Acdtrux†vagy „--" -"test-labelâ€" +"A következÅ‘ kapcsolók közül egynél többet nem használhat: „-Acdtruxâ€, „--" +"delete†vagy „--test-labelâ€" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "A tömörítési kapcsolók ütköznek" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "Ismeretlen szignálnév: %s" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "A dátummintafájl nem található" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "%s cseréje az ismeretlen %s dátumformátumhoz" -#: src/tar.c:1108 -#, fuzzy, c-format +#: src/tar.c:1140 +#, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "„%s†kapcsoló: A(z) „%s†dátum kezelése mint %s" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "az archívum tömörítése a(z) %s használatával" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "A --quoting-style kapcsoló érvényes paraméterei:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2340,49 +2366,48 @@ msgstr "" "\n" "*Ezen* tar alapértelmezései:\n" -#: src/tar.c:1295 -#, fuzzy +#: src/tar.c:1330 msgid "Invalid owner or group ID" -msgstr "Érvénytelen tulajdonos" +msgstr "Érvénytelen tulajdonos- vagy csoportazonosító" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Érvénytelen blokkolási tényezÅ‘" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "Érvénytelen szalagméret" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "Hibás növekményszintérték" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "Egynél több küszöbdátum" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "Érvénytelen ritka verzió érték" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" "Az --atime-preserve='system' nem támogatott ezen az operációs rendszeren" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "A --checkpoint értéke nem egy egész" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Érvénytelen mód került megadásra a kapcsolóban" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "Érvénytelen szám" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" @@ -2390,151 +2415,139 @@ msgstr "" "A --preserve kapcsoló elavult, használja a --preserve-permissions --preserve-" "order kapcsolókat helyette" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Érvénytelen rekordméret" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "A rekordméretnek %d többszörösének kell lennie." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "Érvénytelen elemszám" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "Csak egy --to-command kapcsoló engedélyezett" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "Rosszul formázott sűrűségargumentum: %s" -#: src/tar.c:2133 -#, fuzzy, c-format +#: src/tar.c:2205 +#, c-format msgid "Unknown density: '%c'" msgstr "Ismeretlen sűrűség: „%câ€" -#: src/tar.c:2150 -#, fuzzy, c-format +#: src/tar.c:2222 +#, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "A „-[0-7][lmh]†kapcsolókat *ez* a tar NEM támogatja" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[FÃJL]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 #, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "a --%s kapcsoló nem használható a következÅ‘vel: %s" + +#: src/tar.c:2389 +#, c-format msgid "Old option '%c' requires an argument." msgstr "A régi „%c†kapcsoló paramétert igényel." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "a --occurrence értelmetlen fájllista nélkül" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "a --occurrence nem használható a kért működési módban" - -#: src/tar.c:2408 -#, fuzzy +#: src/tar.c:2490 msgid "Multiple archive files require '-M' option" msgstr "Több archívumfájl esetén szükséges a „-M†kapcsoló" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "" -"A --listed-incremental és a --newer kapcsolók nem használhatók egyszerre" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "a --level értelmetlen a --listed-incremental nélkül" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "%s: A kötetcímke túl hosszú (a korlát %lu bájt)" msgstr[1] "%s: A kötetcímke túl hosszú (a korlát %lu bájt)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "A többkötetes archívumok nem ellenÅ‘rizhetÅ‘k" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "A tömörített archívumok nem ellenÅ‘rizhetÅ‘k" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "A(z) %s minta nem használható" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Nem használhatók többkötetes tömörített archívumok" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "Tömörített archívumok nem fűzhetÅ‘k össze" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "a --pax kapcsoló csak POSIX archívumokon használható" -#: src/tar.c:2478 -#, fuzzy +#: src/tar.c:2560 msgid "--acls can be used only on POSIX archives" -msgstr "a --pax kapcsoló csak POSIX archívumokon használható" +msgstr "a --acls kapcsoló csak POSIX archívumokon használható" -#: src/tar.c:2483 -#, fuzzy +#: src/tar.c:2565 msgid "--selinux can be used only on POSIX archives" -msgstr "a --pax kapcsoló csak POSIX archívumokon használható" +msgstr "a --selinux kapcsoló csak POSIX archívumokon használható" -#: src/tar.c:2488 -#, fuzzy +#: src/tar.c:2570 msgid "--xattrs can be used only on POSIX archives" -msgstr "a --pax kapcsoló csak POSIX archívumokon használható" +msgstr "a --xattrs kapcsoló csak POSIX archívumokon használható" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "A(z) %s minta nem használható" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" +msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "A kötet hossza nem lehet kisebb a rekord méreténél" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "a --preserve-order nem kompatibilis a --listed-incremental kapcsolóval" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "Ãœres archívum létrehozása visszautasítva" -#: src/tar.c:2565 -#, fuzzy +#: src/tar.c:2669 msgid "Options '-Aru' are incompatible with '-f -'" -msgstr "Az „-Aru†kapcsolók összeférhetetlenek a „-f†kapcsolóval" +msgstr "Az „-Aru†kapcsolók összeférhetetlenek a „-f -†kapcsolóval" -#: src/tar.c:2660 -#, fuzzy +#: src/tar.c:2766 msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" msgstr "" -"Meg kell adnia a következÅ‘ kapcsolók egyikét: „-Acdtrux†vagy „--test-labelâ€" +"Meg kell adnia a következÅ‘ kapcsolók egyikét: „-Acdtruxâ€, „--delete†vagy „--" +"test-labelâ€" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "Kilépés hibaállapottal a korábbi hibák miatt" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" @@ -2542,105 +2555,105 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: A fájl zsugorítva %s bájttal" msgstr[1] "%s: A fájl zsugorítva %s bájttal" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "A(z) %s kulcsszó ismeretlen vagy még nincs megvalósítva" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" msgstr "Az idÅ‘bélyeg kívül esik az engedélyezett tartományon" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "A(z) %s minta nem használható" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "A(z) %s minta nem bírálható felül" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "Rosszul formázott kiterjesztett fejléc: a hossz hiányzik" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "A kiterjesztett fejléc %*s hossza kívül esik a tartományon" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "" "Rosszul formázott kiterjesztett fejléc: a hossz után hiányzik egy üres hely " "karakter" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "A kiterjesztett fejléc hibás: egy egyenlÅ‘ségjel hiányzik" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "Rosszul formázott kiterjesztett fejléc: az újsor hiányzik" -#: src/xheader.c:740 -#, fuzzy, c-format +#: src/xheader.c:741 +#, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "" "A(z) „%s†ismeretlen kiterjesztett fejléc kulcsszó figyelmen kívül marad" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "Az előállított kulcsszó/érték pár túl hosszú (kulcsszó: %s, hossz: %s)" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "A kiterjesztett fejléc %s=%s értéke túllépi a(z) %s..%s tartományát" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Rosszul formázott kiterjesztett fejléc: érvénytelen %s=%s" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Rosszul formázott kiterjesztett fejléc: többlet %s=%s" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" "Rosszul formázott kiterjesztett fejléc: érvénytelen %s: váratlan határoló " "(%c)" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" "Rosszul formázott kiterjesztett fejléc: érvénytelen %s: az értékek száma " "páratlan" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "%s: érvénytelen idÅ‘túllépés" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "%s: ismeretlen ellenÅ‘rzÅ‘pont-művelet" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "írás" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "olvasás" @@ -2648,7 +2661,7 @@ msgstr "olvasás" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "%u. írási ellenÅ‘rzÅ‘pont" @@ -2657,7 +2670,7 @@ msgstr "%u. írási ellenÅ‘rzÅ‘pont" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "%u. olvasási ellenÅ‘rzÅ‘pont" @@ -2874,12 +2887,12 @@ msgid "cannot set time on `%s'" msgstr "nem állítható be az idÅ‘ a következÅ‘n: „%sâ€" #: tests/genfile.c:692 -#, fuzzy, c-format +#, c-format msgid "cannot truncate `%s'" -msgstr "a(z) „%s†nem törölhetÅ‘" +msgstr "a(z) „%s†nem csonkítható" #: tests/genfile.c:701 -#, fuzzy, c-format +#, c-format msgid "command failed: %s" msgstr "A(z) „%s†parancs meghiúsult" @@ -2923,12 +2936,19 @@ msgstr "A parancs befejezÅ‘dött\n" msgid "--stat requires file names" msgstr "a --stat fájlneveket igényel" -#~ msgid "Cannot get working directory" -#~ msgstr "A munkakönyvtár nem kérdezhetÅ‘ le" +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "a --occurrence nem használható ezzel: %s" -#~ msgid "sort names to extract to match archive" +#~ msgid "Cannot combine --listed-incremental with --newer" #~ msgstr "" -#~ "kibontandó nevek rendezése, az archívumnak való megfelelés érdekében" +#~ "A --listed-incremental és a --newer kapcsolók nem használhatók egyszerre" + +#~ msgid "--verify cannot be used with %s" +#~ msgstr "A --verify nem használható ezzel: %s" + +#~ msgid "--preserve-order is not compatible with --listed-incremental" +#~ msgstr "" +#~ "a --preserve-order nem kompatibilis a --listed-incremental kapcsolóval" #~ msgid "Field too long while reading snapshot file" #~ msgstr "Túl hosszú mezÅ‘ a pillanatképfájl olvasása közben" @@ -2939,11 +2959,18 @@ msgstr "a --stat fájlneveket igényel" #~ msgid "Unexpected field value in snapshot file" #~ msgstr "Váratlan mezőérték a pillanatképfájlban" -#~ msgid "Extended header length is out of allowed range" -#~ msgstr "A kiterjesztett fejléc hossza kívül esik a tartományon" +#~ msgid "Cannot get working directory" +#~ msgstr "A munkakönyvtár nem kérdezhetÅ‘ le" + +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: a könyvtár el lett távolítva a beolvasás elÅ‘tt" + +#~ msgid "sort names to extract to match archive" +#~ msgstr "" +#~ "kibontandó nevek rendezése, az archívumnak való megfelelés érdekében" #~ msgid "Invalid group" #~ msgstr "Érvénytelen csoport" -#~ msgid "%s: Directory removed before we read it" -#~ msgstr "%s: a könyvtár el lett távolítva a beolvasás elÅ‘tt" +#~ msgid "Extended header length is out of allowed range" +#~ msgstr "A kiterjesztett fejléc hossza kívül esik a tartományon" diff --git a/po/id.gmo b/po/id.gmo index 108f623..5fb522a 100644 Binary files a/po/id.gmo and b/po/id.gmo differ diff --git a/po/id.po b/po/id.po index 5a6fa0e..f4e340c 100644 --- a/po/id.po +++ b/po/id.po @@ -4,12 +4,12 @@ # Tedi Heriyanto , 1999, 2002. # Arif E. Nugroho , 2008, 2009, 2010. # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" "Project-Id-Version: tar 1.23.90\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" "PO-Revision-Date: 2010-07-14 10:00+0700\n" "Last-Translator: Arif E. Nugroho \n" "Language-Team: Indonesian \n" @@ -100,7 +100,7 @@ msgstr "berikan daftar bantuan ini" msgid "give a short usage message" msgstr "berikan sebuah pesan penggunaan singkat" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "NAMA" @@ -435,7 +435,7 @@ msgstr "Bantuan umum menggunakan aplikasi GNU: \n" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: Tidak dapat %s" @@ -444,56 +444,56 @@ msgstr "%s: Tidak dapat %s" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: Peringatan: Tidak dapat %s" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: Tidak dapat mengganti mode ke %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: Tidak dapat merubah kepemilikan ke uid %lu, gid %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: Tidak dapat membuat hard link ke %s" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Error pembacaan di byte %s, ketika membaca %lu byte" msgstr[1] "%s: Error pembacaan di byte %s, ketika membaca %lu byte" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Peringatan: Error pembacaan di byte %s, ketika membaca %lu byte" msgstr[1] "%s: Peringatan: Error pembacaan di byte %s, ketika membaca %lu byte" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: Tidak dapat mencari ke %s" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: Peringatan: Tidak dapat mencari ke %s" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: Tidak dapat membuat symlink ke %s" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -592,8 +592,8 @@ msgstr "Unexpected tidak terduga" msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "Manipulasi sebuah tape drive, menerima perintah dari proses remote" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "NOMOR" @@ -601,10 +601,10 @@ msgstr "NOMOR" msgid "set debug level" msgstr "tentukan tingkat penelusuran" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "BERKAS" @@ -626,104 +626,112 @@ msgstr "terlalu banyak argumen" msgid "Garbage command" msgstr "Perintah sampah" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Ini sepertinya bukan sebuah tar archive" -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" -msgstr "Total byte ditulis" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" msgstr "Total byte dibaca" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "Total byte ditulis" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Total byte dihapus: %s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(pipe)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "Nilai record_size tidak valid" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Tidak diberikan nama archive" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Tidak dapat memverifikasi stdin/stdout archive" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Archive terkompres. Gunakan %s pilihan" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Tidak dapat update compressed archives" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "Berada pada awal tape, berhenti sekarang" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "Terlalu banyak errors, berhenti" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Ukuran record = %lu blok" msgstr[1] "Ukuran record = %lu blok" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "Blok tidak sesuai (%lu byte) dalam arsip" msgstr[1] "Blok tidak sesuai (%lu byte) dalam arsip" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" "Tidak dapat backspace file archives; kemungkinan tidak bisa dibaca tanpa -i" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek tidak dapat berhenti di sebuah batas rekaman" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: berisi nomor volum yang tidak valid" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "Nomor volum overflow" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Mempersiapkan volume #%d untuk %s dan tekan return: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "EOF pada saat user reply diharapkan" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "PERINGATAN: Archive tidak lengkap" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -735,65 +743,65 @@ msgstr "" " q Batalkan tar\n" " y or newline Lanjutkan operasi\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Spawn sebuah subshell\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? Tampilkan daftar ini\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Tidak ada new volume; keluar.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "Nama berkas tidak dispesifikasikan. Coba lagi.\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Masukan tidak valid. Ketik ? untuk bantuan.\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "Perintah %s gagal" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s mungkin dilanjutkan di volume ini: header berisi nama terpotong" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s tidak dilanjutkan di volume ini" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s adalah ukuran yang salah (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Volume ini di luar urutan (%s - %s != %s)" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "Label archive tidak cocok dengan %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "Volume %s tidak sesuai dengan %s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -801,7 +809,7 @@ msgstr "" "%s: nama berkas terlalu panjang untuk diurutkan dalam sebuah GNU multivolume " "header, dipotong" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "tulis tidak berhenti di batas blok" @@ -812,16 +820,16 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Hanya dapat membaca %lu dari %lu byte" msgstr[1] "Hanya dapat membaca %lu dari %lu byte" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "Isi berbeda" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "Unexpected EOF dalam archive" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "Tipe berkas berbeda" @@ -841,7 +849,7 @@ msgstr "Gid berbeda" msgid "Mod time differs" msgstr "Mod time berbeda" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Ukuran berbeda" @@ -858,37 +866,37 @@ msgstr "Symlink berbeda" msgid "Device number differs" msgstr "Nomor perangkat berbeda" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Verifikasi " -#: src/compare.c:471 +#: src/compare.c:473 #, fuzzy, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "%s: Tipe berkas '%c' tidak dikenal, lakukan diff sebagai berkas normal" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "Archive berisi nama berkas dengan awalan dihapus." -#: src/compare.c:533 +#: src/compare.c:535 #, fuzzy msgid "Archive contains transformed file names." msgstr "Arsip berisikan header base-64 yang kadaluarsas" -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "Verifikasi mungkin gagal untuk menemukan berkas orisinil." -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "GAGAL VERIFIKASI: header %d tidak valid terdeteksi" msgstr[1] "GAGAL VERIFIKASI: header %d tidak valid terdeteksi" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "Sebuah lone blok nol di %s" @@ -935,55 +943,55 @@ msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "%s: Berkas diperkecil %s byte; dipadding dengan nol" msgstr[1] "%s: Berkas diperkecil %s byte; dipadding dengan nol" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: file berada pada filesistem yang berbeda; tidak di-dump" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "isi tidak didump" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Tipe file tidak dikenal; file diabaikan" -#: src/create.c:1549 +#: src/create.c:1551 #, c-format msgid "Missing links to %s." msgstr "Hilang hubungan ke %s." -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: berkas tidak berubah; tidak di-dump" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: berkas adalah archive; tidak di-dump" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "direktori tidak didump" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: berkas berubah saat kita membacanya" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: soket diabaikan" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: door diabaikan" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Skip ke header berikutnya" @@ -1030,7 +1038,7 @@ msgid "%s: Cannot extract -- file is continued from another volume" msgstr "" "%s: Tidak dapat mengekstrak -- berkas adalah kelanjutan dari volume lain" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" msgstr "Tidak terduga nama header panjang" @@ -1074,250 +1082,250 @@ msgstr "%s: file berada pada filesistem yang berbeda; tidak di-dump" msgid "%s: Directory has been renamed" msgstr "%s: Direktori telah diganti nama" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "Time stamp tidak valid" -#: src/incremen.c:1045 +#: src/incremen.c:1047 #, fuzzy msgid "Invalid modification time" msgstr "Waktu modifikasi (detik) tidak valid" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "waktu modifikasi (nano detik) tidak valid" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "Nomor perangkat tidak valid" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Nomor inode tidak valid" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" msgstr "" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" msgstr "Tidak terduga EOF dalam berkas snapshot" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" msgstr "" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" msgstr "" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "Hilang pengakhir rekaman" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "Format berkas incremental buruk" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "Versi format incremental tidak didukung: %" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Salah bentuk dumpdir: diduga '%c' tetapi ditemukan %#3o" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Salah bentuk dumpdir: 'X' terduplikasi" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Salah bentuk dumpdir: nama kosong dalam 'R'" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Salah bentuk dumpdir: 'T' tidak diawali oleh 'R'" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Salah bentuk dumpdir: nama kosong dalam 'T'" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "Salah bentuk dumpdir: diduga '%c' tetapi ditemukan akhir dari data" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "Salah bentuk dumpdir: 'X' tidak pernah digunakan" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Tidak dapat membuat direktori sementara menggunakan template %s" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Tidak menghapus direktori: tidak dapat memperoleh statistik" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: direktori berada di perangkat yang berbeda: tidak menghapus" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Menghapus %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: Tidak dapat menghapus" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: Mengabaikan" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "blok %s: ** Blok dari KOSONG **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Akhir dari Berkas **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Kosong dalam header saat diharapkan nilai %s numerik" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "Nilai oktal arsip %.*s di luar batasan %s; asumsikan komplemen dua" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Nilai oktal arsip %.*s di luar batasan %s" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "Arsip berisikan header base-64 yang kadaluarsas" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Arsip yang ditandatangahi dengan string base-64 %s di luar batasan %s" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Nilai arsip base-256 di luar batasan %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Arsip berisikan %.*s ketika nilai numerik %s diharapkan" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Nilai arsip %s dari %s di luar batasan %s..%s" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " link ke %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " tipe file tidak dikenal %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--Link Panjang--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--Nama Panjang--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Volume Header--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Diteruskan pada byte %s--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Membuat direktori:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "Mengganti nama %s ke %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s:Tidak dapat mengganti nama ke %s" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "Mengganti nama %s kembali ke %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Berkas dihapus sebelum kita membacanya" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "proses anak" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "saluran interproses" @@ -1331,7 +1339,7 @@ msgstr "Perintah %s gagal" msgid "%s: file list requested from %s already read from %s" msgstr "%s: daftar berkas telah dibaca" -#: src/names.c:448 +#: src/names.c:448 src/checkpoint.c:274 #, fuzzy, c-format msgid "cannot split string '%s': %s" msgstr "tidak dapat menset waktu di `%s'" @@ -1341,11 +1349,11 @@ msgstr "tidak dapat menset waktu di `%s'" msgid "%s: file name read contains nul character" msgstr "%s: nama berkas yang dibaca berisi karakter nul" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "Pola pencocokan karakter digunakan dalam nama berkas." -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1353,47 +1361,47 @@ msgstr "" "Gunakan --wildcards untuk mengaktifkan pencocokan pola, atau --no-wildcards " "untuk menekan peringatan ini" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: Tidak ditemukan dalam archive" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Kejadian yang diinginkan tidak ditemukan dalam archive" -#: src/names.c:876 +#: src/names.c:879 #, c-format msgid "Archive label mismatch" msgstr "Label archive tidak cocok" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "Menggunakan pilihan -C didalam daftar berkas tidak diijinkan dengan --listed-" "incremental" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Hanya satu pilihan -C yang diijinkan dengan --listed-incremental" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "Pilihan `-%s' dan `-%s' membutuhkan standard masukan" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s: Format archive tidak valid" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "Feature GNU dibutuhkan untuk format archive yang tidak kompatibel" -#: src/tar.c:255 +#: src/tar.c:264 #, fuzzy, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." @@ -1401,7 +1409,7 @@ msgstr "" "Gaya quoting `%s' tidak diketahui. Coba `%s --quoting-style=help' untuk " "memperoleh daftar." -#: src/tar.c:364 +#: src/tar.c:378 #, fuzzy msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " @@ -1422,7 +1430,7 @@ msgstr "" "secara rinci.\n" " tar -xf archive.tar # Bongkar semua berkas dari archive.tar.\n" -#: src/tar.c:373 +#: src/tar.c:387 #, fuzzy msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1444,80 +1452,80 @@ msgstr "" "sebaliknya\n" " never, simple selalu buat cadangan sederhana\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "Mode operasi utama:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "daftar isi dari sebuah archive" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "ekstrak berkas dari sebuah archive" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "buat sebuah archive baru" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "cari perbedaan diantara archive dan sistem berkas" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "tambahkan berkas ke akhir dari sebuah archive" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "hanya tambahkan berkas yang lebih bari dari salinan dalam archive" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "tambahkan berkas tar ke sebuah archive" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "hapus dari archive (bukan dalam pita mag!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "test label volume archive dan keluar" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "Pemodifikasi operasi:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "tangani berkas sparse secara efisien" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "MAJOR[.MINOR]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" "set versi dari format sparse untuk digunakan (mengimplikasikan --sparse)" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "tangani format GNU lama incremental backup" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "tangani format GNU barus incremental backup" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "tingkat `dump' untuk pembuatan `listed-incremental archive'" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "jangan keluar dengan bukan nol dalam berkas tidak dapat dibaca" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1529,133 +1537,141 @@ msgstr "" "diff, --extract atau --list dan ketika sebuah daftar dari berkas diberikan " "baik dalam baris perintah atau melalui pilihan -T; JUMLAH baku ke 1" -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "pencarian tidak dapat dilakukan dalam archive" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "pencarian tidak dapat dilakukan dalam archive" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "" "tidak dapat memeriksa nomor perangkat ketika membuat archive incremental" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "periksa nomor perangkat ketika membuat incremental archive (baku)" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "Overwrite kontrol:" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "mencoba untuk memverifikasi archive setelah menulisnya" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "hapus berkas setelah menambahkannya ke archive" -#: src/tar.c:471 +#: src/tar.c:485 #, fuzzy msgid "don't replace existing files when extracting, treat them as errors" msgstr "jangan timpa berkas yang sudah ada ketika mengekstrak" -#: src/tar.c:474 +#: src/tar.c:488 #, fuzzy msgid "don't replace existing files when extracting, silently skip over them" msgstr "jangan timpa berkas yang sudah ada ketika mengekstrak" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "" "jangan timpa berkas yang sudah ada yang lebih baru dari salinan archivenya" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "overwrite berkas yang sudah ada ketika mengekstrak" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "hapus setiap berkas sebelum mengekstrak diatasnya" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "kosongkan susunan sebelum mengekstrak ke direktori" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "jaga metadata dari direktori yang sudah ada" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "overwrite metadata dari direktori yang sudah ada ketika mengekstrak (baku)" -#: src/tar.c:490 +#: src/tar.c:504 #, fuzzy msgid "preserve existing symlinks to directories when extracting" msgstr "overwrite berkas yang sudah ada ketika mengekstrak" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "DIR" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "Pilih stream keluaran:" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "ekstrak berkas ke standar keluaran" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "PERINTAH" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "pipe berkas terekstrak ke aplikasi lain" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "abaikan kode keluaran dari anak" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "perlakukan kode keluaran bukan nol dari anak sebagai error" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Penanganan dari atribut berkas:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "paksa NAMA sebagai pemilik untuk berkas yang ditambahkan" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "paksa NAMA sebagai grup untuk berkas yang ditambahkan" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "DATE-ATAU-BERKAS" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "set mtime untuk berkas yang ditambahkan dari DATE-OR-FILE" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "PERUBAHAN" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "paksa PERUBAHAN (simbolik) mode untuk berkas yang ditambahkan" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "METODE" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " @@ -1665,11 +1681,11 @@ msgstr "" "setelah membaca (METODE='replace'; baku) atau dengan tidak menset waktu di " "tempat pertama (METODE='system')" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "jangan ekstrak waktu modifikasi berkas" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" @@ -1677,19 +1693,19 @@ msgstr "" "mencoba mengekstrak berkas dengan kepemilikan yang sama yang ada dalam " "archive (baku untuk pengguna super)" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "ekstrak berkas seperti dirimu (baku untuk pengguna biasa)" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "selalu gunakan nomor untuk nama pengguna/grup" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "ekstrak informasi mengenai ijin berkas (baku untuk superuser)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1697,16 +1713,16 @@ msgstr "" "aplikasikan umask pengguna ketika mengekstrak ijin dari archive (baku untuk " "pengguna biasa)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "sama seperti baik -p dan -s" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1714,180 +1730,188 @@ msgstr "" "tunda konfigurasi waktu modifikasi dan ijin untuk direktori terekstrak " "sampai akhir dari ekstrasi" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "batalkan efek dari pilihan --delay-directory-restore" -#: src/tar.c:554 +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 #, fuzzy msgid "Handling of extended file attributes:" msgstr "Penanganan dari atribut berkas:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" msgstr "" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" msgstr "" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" msgstr "" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" msgstr "" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" msgstr "" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" msgstr "" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" msgstr "" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" msgstr "" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "Pemilihan dan pengubahan perangkat:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ARCHIVE" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "gunakan berkas archive atau perangkat ARCHIVE" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "berkas archive adalah lokal walaupun ini memiliki sebuah kolon" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "gunakan PERINTAH rmt yang diberikan daripad rmt" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "gunakan PERINTAH remote daripada rsh" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "spesifikasikan drive dan kepadatan" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "buat/daftar/ekstrak multi-volume archive" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "ubah pita setelah menulis ANGKA x 1024 bytes" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "jalankan script di akhir dari setiap pite (mengimplikasikan -M)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "gunakan/update jumlah volume dalam BERKAS" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "Bloking perangkat:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "BLOK" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "BLOK x 512 byte per detik" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "JUMLAH dari byte per rekaman, kelipatan dari 512" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "abaikan blok yang dinolkan dalam archive (berarti EOF)" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "reblok saat kita baca (untuk 4.2BSD pipes)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "Pemilihan format archive:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "FORMAT" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "buat archive dari format yang diberikan" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "FORMAT adalah satu dari berikut:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "format tar lama V7" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "format gnu tar <= 1.12" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "format GNU tar 1.13.x" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "format POSIX 1003.1-1988 (ustar)" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "format POSIX 1003.1-2001 (pax)" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "sama seperti pax" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "sama seperti --format=v7" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "sama seperti --format=posix" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "kata kunci[[:]=nilai][,kata kunci[[:]=nilai]]..." -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "kontrol kata kunci pax" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "TEKS" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1895,77 +1919,75 @@ msgstr "" "buat archive dengan nama volume TEKS; di waktu daftar/ekstrak, gunakan TEKS " "sebagai sebuah pola globbing untuk nama volume" -#: src/tar.c:660 +#: src/tar.c:684 msgid "Compression options:" msgstr "Pilihan kompresi:" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "gunaka nama akhiran archive untuk menentukan aplikasi kompresi" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "jangan gunakan nama akhiran archive untuk menentukan aplikasi kompresi" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "PROG" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "saring melalui PROG (harus menerima -d)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "Pemilihan berkas lokal:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" "tambahkan berkas yang diberikan ke archive (berguna jika namanya berawal " "dengan sebuah dash)" -#: src/tar.c:687 -msgid "DIR" -msgstr "DIR" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "pindah ke direktori DIR" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "dapatkan nama untuk ekstrak atau buat dari BERKAS" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "-T baca nama berakhiran kosong, non-aktifkan -C" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "non-aktifkan efek dari pilihan --null sebelumnya" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" msgstr "unquote nama berkas baca dengan -T (baku)" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" msgstr "jangan unquote nama berkas baca dengan -T" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "POLA" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "jangan masukan berkas, berikan sebagai sebuah POLA" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "jangan masukan pola yang terdaftar dalam BERKAS" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1973,95 +1995,109 @@ msgstr "" "jangan masukan isi dari direktori berisi CACHEDIR.TAG, kecuali untuk berkas " "tag itu sendiri" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "jangan masukan apapun dibawah direktori berisi CACHEDIR.TAG" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "jangan masukan direktori berisi CACHEDIR.TAG" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" "jangan masukan isi dari direktori berisi BERKAS, kecuali untuk BERKAS itu " "sendiri" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "jangan masukan apapun dibawah direktori berisi BERKAS" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "jangan masukan direktori berisi BERKAS" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "jangan masukan direktori sistem pengontrol direktori" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "abaikan berkas cadangan dan berkas kunci" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "hindari penurunan secara otomatis dalam direktori" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "tetap dalam sistem berkas lokal ketika membuat archive" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "rekursif kedalam direktori (baku)" -#: src/tar.c:729 +#: src/tar.c:761 #, fuzzy msgid "don't strip leading '/'s from file names" msgstr "jangan hilangkan awalan `/' dari nama berkas" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "ikuti symlinks; berkas archive dan dump yang mereka tunjuk ke" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "ikuti hard links; berkas archive dan dump yang mereka refer ke" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "NAMA-ANGGOTA" -#: src/tar.c:735 +#: src/tar.c:767 #, fuzzy msgid "begin at member MEMBER-NAME when reading the archive" msgstr "berawal di anggota NAMA-ANGGOTA dalam archive" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "hanya simpan berkas lebih baru dari DATE-OR-FILE" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "TANGGAL" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "bandingkan tanggal dan waktu hanya ketika data berubah" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "KONTROL" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "backup sebelum penghapusan, pilih PENGONTROL versi" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "STRING" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -2069,100 +2105,100 @@ msgstr "" "backup sebelum penghapusan, override akhiran biasa ('~' kecuali di override " "oleh variabel lingkungan SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "Transformasi nama berkas:" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "" "hilangkan NOMOR yang mengawali komponen dari nama berkas di waktu ekstraksi" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "EKSPRESI" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "gunakan sed EKSPRESI replace untuk mengubah nama berkas" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "Pilihan nama berkas cocok (mempengaruhi baik pola exclude dan include):" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "abaikan perbedaan huruf besar dan huruf kecil" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "pencocokan pola nama berkas mulai" -#: src/tar.c:767 +#: src/tar.c:799 #, fuzzy msgid "patterns match after any '/' (default for exclusion)" msgstr "pencocokan polah setelah `/' apapun (baku untuk exclusion)" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "pencocokan dengan memperhatikan huruf besar dan huruf kecil (baku)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "gunakan wildcards (baku untuk exclusion)" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "pencocok verbatim string" -#: src/tar.c:775 +#: src/tar.c:807 #, fuzzy msgid "wildcards do not match '/'" msgstr "wildcards tidak cocok `/'" -#: src/tar.c:777 +#: src/tar.c:809 #, fuzzy msgid "wildcards match '/' (default for exclusion)" msgstr "wildcards cocok `/' (baku untuk exclusion)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Keluaran informative:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "proses daftar berkas secara verbose" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "KATA KUNCI" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "pengendali peringatan" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "tampilkan pesan perkembangan setiap rekaman ke ANGKA (baku 10)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "AKSI" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "jalankan AKSI disetiap titik pemeriksaan" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "tampilkan sebuah pesan jika tidak seluruh link didump" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "SINYAL" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2174,35 +2210,35 @@ msgstr "" "adalah: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 dan SIGUSR2; nama tanpa awalah SIG " "juga diterima" -#: src/tar.c:802 +#: src/tar.c:834 msgid "print file modification times in UTC" msgstr "tampilkan waktu modifikasi berkas dalam UTC" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "tampilkan waktu berkas sampai ke resolusi penuh" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "kirim keluaran verbose ke BERKAS" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "tampilkan jumlah blok didalam archive dengan setiap pesan" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "minta konfirmasi untuk setiap aksi" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "tampilkan tar baku" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2210,31 +2246,31 @@ msgstr "" "ketika mendaftar atau mengekstrak, daftar setiap direktori yang tidak cocok " "dengan kriteria pencarian" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "tampilkan berkas atau nama berkas setelah transformasi" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "GAYA" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "set nama quoting gaya; lihat dibawah untuk nilai GAYA yang valid" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "sebagai tambahan karakter quote dari STRING" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "non-aktifkan quoting untuk karakter dari STRING" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "Pilihan yang kompatibel:" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2242,15 +2278,15 @@ msgstr "" "ketika membuat, sama seperti --old-archive; ketika mengekstrak, sama seperti " "--no-same-owner" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "Pilihan lain:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "non-aktifkan penggunaan dari pilihan berbahaya yang berpotensial" -#: src/tar.c:978 +#: src/tar.c:1010 #, fuzzy msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " @@ -2259,40 +2295,40 @@ msgstr "" "Anda tidak bisa menspesifikasikan lebih dari satu pilihan `-Acdtrux' atau `--" "test-label'" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Pilihan kompresi konflik" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "Nama sinyal: %s tidak dikenal" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "Tanggal contoh berkas tidak ditemukan" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Menggantikan %s untuk format tanggal tidak dikenal %s" -#: src/tar.c:1108 +#: src/tar.c:1140 #, fuzzy, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "Pilihan %s: memperlakukan tanggal `%s' sebagai %s" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "saring archive melalui %s" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "Argumen yang valid untuk pilihan --quoting-style adalah:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2300,48 +2336,48 @@ msgstr "" "\n" "*Ini* tar baku ke:\n" -#: src/tar.c:1295 +#: src/tar.c:1330 #, fuzzy msgid "Invalid owner or group ID" msgstr "Pemilik tidak valid" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Faktor bloking tidak valid" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "Panjang tape tidak valid" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "Nilai tingkat peningkatan tidak valid" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "Lebih dari satu treshold date" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "Nilai versi sparse tidak valid" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "pilihan --atime-preserve='system' tidak didukung di platform ini" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "nilai --checkpoint bukan sebuah integer" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Mode tidak tepat diberikan pada pilihan" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "Nomor tidak valid" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" @@ -2349,139 +2385,129 @@ msgstr "" "Pilihan --preserve sudah ditinggalkan, lebih baik gunakan --preserve-" "permissions --preserve-order" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Ukuran record tidak valid" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "Jumlah record harus kelipatan dari %d." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "Jumlah dari elemen tidak valid" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "Hanya satu pilihan --to-command yang diijinkan" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "Salah bentuk kepadatan argumen: %s" -#: src/tar.c:2133 +#: src/tar.c:2205 #, fuzzy, c-format msgid "Unknown density: '%c'" msgstr "Kepadatan tidak diketahui: `%c'" -#: src/tar.c:2150 +#: src/tar.c:2222 #, fuzzy, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "Pilihan `-[0-7][lmh]' tidak didukung oleh tar *ini*" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[BERKAS]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 +#, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "Pola %s tidak dapat digunakan" + +#: src/tar.c:2389 #, fuzzy, c-format msgid "Old option '%c' requires an argument." msgstr "Pilihan 'lama' `%c' membutuhkan argument." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence tidak berarti tanpa sebuah daftar berkas" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "--occurrence tidak dapat digunakan dalam mode operasi yang diminta" - -#: src/tar.c:2408 +#: src/tar.c:2490 #, fuzzy msgid "Multiple archive files require '-M' option" msgstr "Berkas multiple archive membutuhkan pilihan '-M'" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "Tidak dapat menggabungkan --listed-incremental dengan --newer" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "--level tidak berarti tanpa --listed-incremental" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "%s: Label volume terlalu panjang (batasnya adalah %lu byte)" msgstr[1] "%s: Label volume terlalu panjang (batasnya adalah %lu byte)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Tidak dapat verifikasi multi-volume archives" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Tidak dapat verify compressed archives" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "Pola %s tidak dapat digunakan" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Tidak dapat menggunakan multi-volume compressed archives" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "Tidak dapat update compressed archives" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option hanya dapat digunakan dalam archive POSIX" -#: src/tar.c:2478 +#: src/tar.c:2560 #, fuzzy msgid "--acls can be used only on POSIX archives" msgstr "--pax-option hanya dapat digunakan dalam archive POSIX" -#: src/tar.c:2483 +#: src/tar.c:2565 #, fuzzy msgid "--selinux can be used only on POSIX archives" msgstr "--pax-option hanya dapat digunakan dalam archive POSIX" -#: src/tar.c:2488 +#: src/tar.c:2570 #, fuzzy msgid "--xattrs can be used only on POSIX archives" msgstr "--pax-option hanya dapat digunakan dalam archive POSIX" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "Pola %s tidak dapat digunakan" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" +msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "Panjang volume tidak dapat lebih kecil dari ukuran rekaman" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "--preserve-order tidak kompatibel dengan --listed-incremental" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "Secara takut menolak untuk membuat sebuah archive kosong" -#: src/tar.c:2565 +#: src/tar.c:2669 #, fuzzy msgid "Options '-Aru' are incompatible with '-f -'" msgstr "Pilihan '-Aru' tidak kompatibel dengan `-f -'" -#: src/tar.c:2660 +#: src/tar.c:2766 #, fuzzy msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" @@ -2489,11 +2515,15 @@ msgstr "" "Anda harus menspesifikasikan salah satu dari pilihan `-Acdtrux' atau `--test-" "label'" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "Keluar dengan status gagal karena error error sebelumnya" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" @@ -2501,52 +2531,52 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: Berkas mengecil sebanyak %s byte" msgstr[1] "%s: Berkas mengecil sebanyak %s byte" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "Kata kunci %s tidak diketahui atau belum diimplementasikan" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" msgstr "Penanda waktu di luar dari jangkauan yang diijinkan" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "Pola %s tidak dapat digunakan" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Kata kunci %s tidak dapat dioverride" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "Salah bentuk ekstensi header: hilang panjang" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "Ekstensi panjang header %*s diluar dari jangkauan" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "Salah bentuk ekstensi header: hilang blank setelah panjang" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "Salah bentuk ekstensi header: hilang tanda sama dengan" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "Salah bentuk ekstensi header: hilang baris baru" -#: src/xheader.c:740 +#: src/xheader.c:741 #, fuzzy, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "Mengabaikan kata kunci ekstensi `%s' yang tidak diketahui" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" @@ -2555,46 +2585,46 @@ msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "Ekstensi header %s=%s diluar dari jangkauan %s..%s" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Salah bentuk ekstensi header: tidak valid %s=%s" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Salah bentuk ekstensi header: kelebihan %s=%s" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "Salah bentuk ekstensi header: tidak valid %s: tidak diduga pembatas %c" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "Salah bentuk ekstensi header: tidak valid %s: jumlah dari nilai ganjil" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "%s: bukan sebuah kehabisan waktu yang valid" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "%s: aksi titik pemeriksaan tidak diketahui" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "tulis" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "baca" @@ -2602,7 +2632,7 @@ msgstr "baca" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "Menulis titik pemeriksaan %u" @@ -2611,7 +2641,7 @@ msgstr "Menulis titik pemeriksaan %u" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "Membaca titik pemeriksaan %u" @@ -2874,13 +2904,19 @@ msgstr "Perintah berakhir\n" msgid "--stat requires file names" msgstr "--stat membutuhkan nama berkas" -#, fuzzy -#~ msgid "Cannot get working directory" -#~ msgstr "Tidak bisa pindah direktori kerja" - #~ msgid "sort names to extract to match archive" #~ msgstr "urutkan nama untuk mengekstrak supaya cocok dengan archive" +#, fuzzy +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "--occurrence tidak dapat digunakan dalam mode operasi yang diminta" + +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "Tidak dapat menggabungkan --listed-incremental dengan --newer" + +#~ msgid "--preserve-order is not compatible with --listed-incremental" +#~ msgstr "--preserve-order tidak kompatibel dengan --listed-incremental" + #~ msgid "Field too long while reading snapshot file" #~ msgstr "Field terlalu panjang ketika membaca berkas snapshot" @@ -2890,17 +2926,20 @@ msgstr "--stat membutuhkan nama berkas" #~ msgid "Unexpected field value in snapshot file" #~ msgstr "Tidak terduga nilai field dalam berkas snapshot" -#~ msgid "Extended header length is out of allowed range" -#~ msgstr "Ekstensi panjang header diluar dari jangkauan yang diijinkan" +#~ msgid "Cannot save working directory" +#~ msgstr "Tidak dapat menyimpan direktori kerja" -#~ msgid "Invalid group" -#~ msgstr "Grup tidak valid" +#~ msgid "Cannot change working directory" +#~ msgstr "Tidak bisa pindah direktori kerja" #~ msgid "%s: Directory removed before we read it" #~ msgstr "%s: Direktori dihapus sebelum kita membacanya" -#~ msgid "Cannot save working directory" -#~ msgstr "Tidak dapat menyimpan direktori kerja" +#~ msgid "Invalid group" +#~ msgstr "Grup tidak valid" + +#~ msgid "Extended header length is out of allowed range" +#~ msgstr "Ekstensi panjang header diluar dari jangkauan yang diijinkan" #~ msgid "Cannot resolve hostname %s" #~ msgstr "Tidak dapat menemukan alamat dari nama host %s" diff --git a/po/it.gmo b/po/it.gmo index f0f6910..38ff1dd 100644 Binary files a/po/it.gmo and b/po/it.gmo differ diff --git a/po/it.po b/po/it.po index 64494d7..e4d608e 100644 --- a/po/it.po +++ b/po/it.po @@ -1,25 +1,26 @@ # Italian translation of GNU tar. -# Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright (C) 2008, 2009, 2010, 2011, 2013 Free Software Foundation, Inc. # This file is distributed under the same license as the tar package. # # Lele Gaifax , 1996. # Marco d'Itri , 1998. +# Milo Casagrande , 2008-2010, 2011, 2013. # -# Milo Casagrande , 2008-2010, 2011. -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" -"Project-Id-Version: tar-1.26\n" +"Project-Id-Version: tar-1.27\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" -"PO-Revision-Date: 2011-03-13 12:09+0100\n" -"Last-Translator: Milo Casagrande \n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" +"PO-Revision-Date: 2013-10-09 10:20+0200\n" +"Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" "Language: it\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" +"Content-Transfer-Encoding: 8-bit\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"X-Generator: Gtranslator 2.91.6\n" #: gnu/argmatch.c:135 #, c-format @@ -81,9 +82,9 @@ msgid " [OPTION...]" msgstr " [OPZIONE...]" #: gnu/argp-help.c:1686 -#, fuzzy, c-format +#, c-format msgid "Try '%s --help' or '%s --usage' for more information.\n" -msgstr "Usare \"%s --help\" o \"%s --usage\" per ulteriori informazioni.\n" +msgstr "Provare \"%s --help\" o \"%s --usage\" per ulteriori informazioni.\n" #: gnu/argp-help.c:1714 #, c-format @@ -102,7 +103,7 @@ msgstr "Mostra questo aiuto" msgid "give a short usage message" msgstr "Mostra un breve messaggio sull'uso" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "NOME" @@ -141,9 +142,9 @@ msgid "write error" msgstr "Errore di scrittura" #: gnu/getopt.c:549 gnu/getopt.c:578 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: l'opzione \"%s\" è ambigua\n" +msgstr "%s: l'opzione \"%s\" è ambigua; possibilità:" #: gnu/getopt.c:626 gnu/getopt.c:630 #, c-format @@ -439,7 +440,7 @@ msgstr "Aiuto per l'utilizzo di software GNU: \n" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: funzione \"%s\" non riuscita" @@ -448,56 +449,56 @@ msgstr "%s: funzione \"%s\" non riuscita" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: attenzione: funzione \"%s\" non riuscita" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: impossibile cambiare il modo a %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: impossibile cambiare il proprietario all'UID %lu e al GID %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: impossibile creare un collegamento fisico a %s" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: errore di lettura al byte %s leggendo %lu byte" msgstr[1] "%s: errore di lettura al byte %s leggendo %lu byte" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: attenzione: errore di lettura al byte %s leggendo %lu byte" msgstr[1] "%s: attenzione: errore di lettura al byte %s leggendo %lu byte" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: impossibile fare seek a %s" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: attenzione: impossibile fare seek a %s" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: impossibile creare un collegamento simbolico a %s" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -543,9 +544,9 @@ msgid "Cannot connect to %s: resolve failed" msgstr "Impossibile connettersi a %s: \"resolve\" non riuscita" #: lib/rtapelib.c:502 -#, fuzzy, c-format +#, c-format msgid "Cannot redirect files for remote shell" -msgstr "Impossibile eseguire la shell remota" +msgstr "Impossibile reindirizzare i file dalla shell remota" #: lib/rtapelib.c:516 #, c-format @@ -597,8 +598,8 @@ msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "" "Manipola un dispositivo a nastro, accettando comandi da un processo remoto" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "NUMERO" @@ -606,10 +607,10 @@ msgstr "NUMERO" msgid "set debug level" msgstr "Imposta il livello di debug" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "FILE" @@ -631,106 +632,114 @@ msgstr "troppi argomenti" msgid "Garbage command" msgstr "Comando spazzatura" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Questo non sembra un archivio tar" -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" -msgstr "Byte totali scritti" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" msgstr "Byte totali letti" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "Byte totali scritti" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Byte totali eliminati: %s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(pipe)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "Valore di record_size non valido" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Non è stato indicato il nome di un archivio" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Impossibile verificare archivi su stdin/stdout" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "L'archivio è compresso. Usare l'opzione %s." -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Impossibile aggiornare archivi compressi" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "All'inizio del nastro, uscita immediata" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "Troppi errori, uscita" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Dimensioni del record = %lu blocco" msgstr[1] "Dimensioni del record = %lu blocchi" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "Blocco non allineato nell'archivio (%lu byte)" msgstr[1] "Blocco non allineato nell'archivio (%lu byte)" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" "Impossibile muoversi all'indietro nel file dell'archivio; potrebbe non " "essere\n" "leggibile senza l'opzione -i" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek non si è fermata al limite di un record" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: contiene un numero di volume non valido" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "Overflow del numero di volume" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Preparare il volume #%d per %s e premere Invio: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "Ricevuto EOF quando era attesa la risposta dell'utente" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "Attenzione: l'archivio non è completo" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -742,67 +751,67 @@ msgstr "" " q Termina tar\n" " y o Invio Continua l'operazione\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Esegue una subshell\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? Stampa questo elenco\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Nessun nuovo volume; uscita.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "Nome file non specificato. Riprovare.\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Input non valido. Premere ? per l'aiuto.\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "comando \"%s\" non riuscito" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" "%s potrebbe continuare su questo volume: l'intestazione contiene un nome " "troncato" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s non continua su questo volume" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s è la dimensione sbagliata (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Questo volume è fuori sequenza (%s - %s != %s)" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "L'archivio non ha un'etichetta corrispondente a %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "Il volume %s non corrisponde a %s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -810,7 +819,7 @@ msgstr "" "%s: il nome del file è troppo lungo per essere scritto in un'intestazione " "GNU multi-volume, troncato" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "write non si è fermata al limite di un record" @@ -821,16 +830,16 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "È stato possibile leggere solo %lu byte di %lu" msgstr[1] "È stato possibile leggere solo %lu byte di %lu" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "I contenuti sono differenti" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "EOF inatteso nell'archivio" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "I tipi dei file sono diversi" @@ -850,7 +859,7 @@ msgstr "I GID sono diversi" msgid "Mod time differs" msgstr "Gli orari di modifica sono diversi" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Le dimensioni sono diverse" @@ -867,36 +876,36 @@ msgstr "I collegamenti simbolici sono diversi" msgid "Device number differs" msgstr "I numeri dei device sono diversi" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Verifica " -#: src/compare.c:471 -#, fuzzy, c-format +#: src/compare.c:473 +#, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "%s: tipo di file \"%c\" sconosciuto, confrontato come un file normale" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "L'archivio contiene nomi di file con i prefissi iniziali rimossi." -#: src/compare.c:533 +#: src/compare.c:535 msgid "Archive contains transformed file names." msgstr "L'archivio contiene nomi di file trasformati." -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "La verifica potrebbe non riuscire a trovare i file originali." -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "Errore di verifica: trovata %d intestazione non valida" msgstr[1] "Errore di verifica: trovate %d intestazioni non valide" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "Un singolo blocco di zeri a %s" @@ -943,55 +952,55 @@ msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "%s: file ristretto di %s byte; riempito con zeri" msgstr[1] "%s: file ristretto di %s byte; riempito con zeri" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: il file si trova su un altro file system; non archiviato" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "contenuti non archiviati" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: tipo di file sconosciuto; file ignorato" -#: src/create.c:1549 +#: src/create.c:1551 #, c-format msgid "Missing links to %s." msgstr "Collegamenti mancanti a %s." -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: il file non è modificato; non archiviato" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: il file è l'archivio; non archiviato" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "directory non archiviata" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: file modificato mentre era in lettura" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: socket ignorato" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: door ignorata" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Passaggio alla prossima intestazione" @@ -1018,7 +1027,7 @@ msgstr "%s: incoerenza inaspettata nel creare la directory" #: src/extract.c:705 #, c-format msgid "%s: skipping existing file" -msgstr "" +msgstr "%s: file esistente saltato" #: src/extract.c:821 #, c-format @@ -1039,12 +1048,12 @@ msgstr "" msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: impossibile estrarre -- il file continua da un altro volume" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" msgstr "Intestazione di nome lungo inattesa" #: src/extract.c:1542 -#, fuzzy, c-format +#, c-format msgid "%s: Unknown file type '%c', extracted as normal file" msgstr "%s: tipo di file \"%c\" sconosciuto, estratto come file normale" @@ -1081,164 +1090,165 @@ msgid "%s: Directory is new" msgstr "%s: directory nuova" #: src/incremen.c:566 -#, fuzzy, c-format +#, c-format msgid "%s: directory is on a different filesystem; not dumped" -msgstr "%s: il file si trova su un altro file system; non archiviato" +msgstr "%s: la directory si trova su un altro file system; non archiviato" #: src/incremen.c:587 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: directory rinominata" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "Orario non valido" -#: src/incremen.c:1045 -#, fuzzy +#: src/incremen.c:1047 msgid "Invalid modification time" -msgstr "Orario di modifica non valido (secondi)" +msgstr "Orario di modifica non valido" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "Orario di modifica non valido (nanosecondi)" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "Numero di device non valido" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Numero dell'inode non valido" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" -msgstr "" +msgstr "%s: byte %s: %s %.*s... troppo lungo" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" msgstr "EOF inatteso nel file di snapshot" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" -msgstr "" +msgstr "%s: byte %s: %s %s seguito dal byte non valido 0x%02x" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" +"%s: byte %s: (intervallo valido %s..%s)\n" +"\t%s %s" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" -msgstr "" +msgstr "%s: byte %s: %s %s" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" -msgstr "" +msgstr "%s: byte %s: %s" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "Record finale mancante" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "Formato file incrementale errato" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "Versione formato incrementale non supportata: %" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "dumpdir malformata: atteso \"%c\", ma trovato %#3o" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "dumpdir malformata: \"X\" duplicata" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "dumpdir malformata: nessun nome in \"R\"" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "dumpdir malformata: \"T\" non preceduta da \"R\"" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "dumpdir malformata: nessun nome in \"T\"" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "dumpdir malformata: atteso \"%c\", ma trovata la fine dei dati" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "dumpdir malformata: \"X\" mai usata" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Impossibile creare la directory temporanea usando il modello %s" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: eliminazione directory non eseguita: impossibile fare stat" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: la directory si trova su un altro device: non eliminata" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: eliminazione di %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: impossibile rimuoverlo" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: omesso" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "blocco %s: ** Blocco di NUL **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "blocco %s: ** Fine del file **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "blocco %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Trovati spazi nell'intestazione dove era atteso il valore numerico %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1246,125 +1256,124 @@ msgstr "" "che sia in complemento a due" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Il valore ottale %.*s dell'archivio è fuori dall'intervallo %s" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "L'archivio contiene intestazioni base-64 obsolete" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" "La stringa base-64 con segno %s dell'archivio è fuori dall'intervallo %s" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Il valore base-256 dell'archivio è fuori dall'intervallo %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "L'archivio contiene %.*s dove era atteso il valore numerico %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Il valore %s dell'archivio è fuori dall'intervallo (%s) %s..%s" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " collegamento a %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " tipo di file sconosciuto %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--Collegamento lungo--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--Nome lungo--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Intestazione del volume--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Continua al byte %s--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Creazione directory:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "Rinomina di %s in %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: impossibile rinominarlo in %s" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "Rinomina di %s nuovamente in %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: file rimosso prima di poterlo leggere" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "il processo figlio" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "il canale tra processi" #: src/names.c:360 -#, fuzzy msgid "command line" -msgstr "comando \"%s\" non riuscito" +msgstr "riga di comando" #: src/names.c:378 -#, fuzzy, c-format +#, c-format msgid "%s: file list requested from %s already read from %s" -msgstr "%s: elenco file già letto" +msgstr "%s: l'elenco file richiesto da %s è già stato letto da %s" -#: src/names.c:448 -#, fuzzy, c-format +#: src/names.c:448 src/checkpoint.c:274 +#, c-format msgid "cannot split string '%s': %s" -msgstr "impossibile impostare l'orario su \"%s\"" +msgstr "impossibile dividere la stringa \"%s\": %s" #: src/names.c:490 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: il nome di file letto contiene un carattere NULL" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "Usati caratteri di corrispondenza nei nomi dei file." -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1372,56 +1381,55 @@ msgstr "" "Usare --wildcards per abilitare la corrispondenza o --no-wildcards per " "disabilitare l'avviso" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: non trovato nell'archivio" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: occorrenza richiesta non trovata nell'archivio" -#: src/names.c:876 +#: src/names.c:879 #, c-format msgid "Archive label mismatch" msgstr "Etichetta dell'archivio non corrispondente" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "L'utilizzo dell'opzione -C all'interno dell'elenco dei file non è consentita " "con --listed-incremental" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Solo un'opzione -C è consentita con --listed-incremental" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "Le opzioni \"-%s\" e \"-%s\" richiedono entrambe lo standard input" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s: formato dell'archivio non valido" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "Richieste funzionalità GNU su un formato di archivio incompatibile" -#: src/tar.c:255 -#, fuzzy, c-format +#: src/tar.c:264 +#, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." msgstr "" "Stile di citazione \"%s\" non conosciuto. Provare \"%s --quoting-style=help" "\" per visualizzarne un elenco." -#: src/tar.c:364 -#, fuzzy +#: src/tar.c:378 msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1432,17 +1440,15 @@ msgid "" " tar -xf archive.tar # Extract all files from archive.tar.\n" msgstr "" "La versione GNU di \"tar\" è in grado di salvare molti file in un solo " -"archivio su nastro o su disco e può ripristinare singoli file " -"dall'archivio.\n" +"archivio\n" +"su nastro o su disco e può ripristinare singoli file dall'archivio.\n" "\n" "Esempi:\n" -" tar -cf archivio.tar foo bar # Crea archivio.tar dai file foo e bar\n" -" tar -tvf archivio.tar # Elenca prolissamente i file in archivio." -"tar\n" -" tar -xf archivio.tar # Estrae tutti i file da archivio.tar\n" +" tar -cf archivio.tar pippo pluto # Crea archivio.tar dai file pippo pluto\n" +" tar -tvf archivio.tar # Elenca i file in archivio.tar\n" +" tar -xf archivio.tar # Estrae tutti i file da archivio.tar\n" -#: src/tar.c:373 -#, fuzzy +#: src/tar.c:387 msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" "The version control may be set with --backup or VERSION_CONTROL, values " @@ -1456,90 +1462,89 @@ msgstr "" "Il suffisso dei backup è \"~\" a meno che non sia impostato con --suffix " "oppure\n" "SIMPLE_BACKUP_SUFFIX.\n" -"Il controllo di versione può essere impostato con --backup oppure " -"VERSION_CONTROL,\n" -"i valori possibili sono:\n" +"Il controllo di versione può essere impostato con --backup oppure con\n" +"VERSION_CONTROL. I valori possibili sono:\n" "\n" " none, off Non esegue mai i backup\n" " t, numbered Esegue backup numerati\n" " nil, existing Numerati se esistono backup numerati, altrimenti semplici\n" " never, simple Esegue sempre backup semplici\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "Modi operativi principali:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "Elenca i contenuti dell'archivio" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "Estrae file da un archivio" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "Crea un nuovo archivio" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "Trova differenze tra l'archivio e il file system" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "Accoda i file alla fine di un archivio" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "Accoda solo i file più recenti della copia nell'archivio" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "Aggiunge il contenuto di un altro archivio" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "Elimina dall'archivio (non su nastri magnetici)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "Verifica l'etichetta di volume dell'archivio ed esce" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "Modificatori delle operazioni:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "Gestisce efficientemente i file sparsi" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "MAJOR[.MINOR]" # (ndt) hmmm... formato sparso... -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "Imposta la versione da usare per il formato sparso (implica --sparse)" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "gestisce i vecchi backup incrementali GNU" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "Gestisce il nuovo formato di backup incrementali GNU" # (ndt) suggerimenti? -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "Livello di dump per l'archivio a lista incrementale creato" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "Non esce con non-zero quando ci sono file non leggibili" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1552,133 +1557,139 @@ msgstr "" "sulla riga di comando o attraverso l'opzione -T; il valore predefinito di " "NUMERO è 1" -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "L'archivio è posizionabile" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "L'archivio non è posizionabile" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "Non controlla i numeri del device quando crea archivi incrementali" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" "Controlla i numeri del device quando crea archivi incrementali (predefinito)" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "Controlli di sovrascrittura:" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "Tenta di verificare l'archivio dopo averlo scritto" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "Rimuove i file dopo averli aggiunti all'archivio" -#: src/tar.c:471 -#, fuzzy +#: src/tar.c:485 msgid "don't replace existing files when extracting, treat them as errors" -msgstr "Durante l'estrazione non sovrascrive i file esistenti" +msgstr "" +"Durante l'estrazione non sovrascrive i file esistenti, li considera errori" -#: src/tar.c:474 -#, fuzzy +#: src/tar.c:488 msgid "don't replace existing files when extracting, silently skip over them" -msgstr "Durante l'estrazione non sovrascrive i file esistenti" +msgstr "Durante l'estrazione non sovrascrive i file esistenti, li ignora" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "Non sostituisce i file esistenti più recenti delle copie nell'archivio" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "Sovrascrive i file esistenti durante l'estrazione" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "Rimuove ogni file prima di estrarre su di esso" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "Svuota le directory prima di estrarle" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "Preserva i metadati delle directory esistenti" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "Sovrascrive i metadati delle directory esistenti durante l'estrazione " "(predefinito)" -#: src/tar.c:490 -#, fuzzy +#: src/tar.c:504 msgid "preserve existing symlinks to directories when extracting" -msgstr "Sovrascrive i file esistenti durante l'estrazione" +msgstr "Mantiene i collegamenti simbolici a directory durante l'estrazione" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "DIR" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "Selezione stream di output:" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "Estrae i file sullo standard output" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "COMANDO" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "Invia in pipe i file estratti a un altro programma" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "Ignora il codice di uscita dei figli" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "Considera i codici di uscita non-zero come un errore" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Gestione degli attributi dei file:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "Forza NOME come proprietario per i file aggiunti" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "Forza NOME come gruppo per i file aggiunti" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "DATA-O-FILE" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "Imposta mtime per i file aggiunti da DATA-O-FILE" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "CAMBI" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "Forza il modo CAMBI (simbolico) per i file aggiunti" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "METODO" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " @@ -1688,11 +1699,11 @@ msgstr "" "dopo la lettura (METODO=\"replace\"; predefinito) o impostando l'orario " "all'inizio (METODO=\"system\")" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "Non estrae l'orario di ultima modifica del file" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" @@ -1700,22 +1711,22 @@ msgstr "" "Cerca di estrarre i file con lo stesso proprietario come presente " "nell'archivio (predefinito per il super utente)" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "" "Estrae i file come l'utente attuale (predefinito per gli utenti normali)" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "Usa sempre i numeri per i nomi di utente/gruppo" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" "Estrae informazioni riguardo i permessi dei file (predefinito per il super-" "utente)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1723,16 +1734,16 @@ msgstr "" "Applica la umask dell'utente nell'estrarre i permessi dall'archivio " "(predefinito per gli utenti normali)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" -msgstr "" +msgstr "Gli argomenti sono elencati nello stesso ordine dei file nell'archivio" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "Come -p e -s assieme" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1740,180 +1751,187 @@ msgstr "" "Ritarda l'impostazione dei tempi di modifica e dei permessi delle directory " "estratte al termine dell'estrazione" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "Annulla l'effetto dell'opzione --delay-directory-restore" -#: src/tar.c:554 -#, fuzzy +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 msgid "Handling of extended file attributes:" -msgstr "Gestione degli attributi dei file:" +msgstr "Gestione degli attributi estesi dei file:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" -msgstr "" +msgstr "Abilita supporto degli attributi estesi" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" -msgstr "" +msgstr "Disabilita supporto degli attributi estesi" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" -msgstr "" +msgstr "MASCHERA" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" -msgstr "" +msgstr "Specifica il modello di inclusione per le chiavi xattr" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" -msgstr "" +msgstr "Specifica il modello di esclusione per le chiavi xattr" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" -msgstr "" +msgstr "Abilita supporto contesto SELinux" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" -msgstr "" +msgstr "Disabilita supporto contesto SELinux" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" -msgstr "" +msgstr "Abilita support ACL POSIX" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" -msgstr "" +msgstr "Disabilita supporto ACL POSIX" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "Selezione e cambio del device:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ARCHIVIO" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "Usa come archivio il file o il dispositivo ARCHIVIO" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "L'archivio è locale anche se contiene \":\"" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "Usa il COMANDO rmt indicato invece di rmt" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "Usa il COMANDO remoto invece di rsh" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "Indica drive e densità" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "Crea, elenca, estrae archivi multi-volume" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "Cambia il nastro dopo avere scritto NUMERO × 1024 byte" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "Esegue lo script alla fine di ogni nastro (implica -M)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "Usa/aggiorna il numero del volume nel FILE" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "Blocchi del device:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "BLOCCHI" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "Usa record di BLOCCHI × 512 byte" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "NUMERO di byte per record, multiplo di 512" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "Ignora i blocchi a zero nell'archivio (significa EOF)" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "Rifà i blocchi durante la lettura (per le pipe di 4.2BSD)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "Selezione formato di archiviazione:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "FORMATO" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "Crea archivi nel formato indicato" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "FORMATO è uno dei seguenti:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "Vecchio formato di tar V7" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "Formato GNU di tar <= 1.12" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "Formato GNU di tar 1.13.x" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "Formato POSIX 1003.1-1988 (ustar)" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "Formato POSIX 1003.1-2001 (pax)" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "Come pax" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "Come --format=v7" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "Come --format=posix" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "PAROLA_CHIAVE[[:]=VALORE][,PAROLA_CHIAVE[[:]=VALORE], ...]" -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "Controlla le parole chiavi di pax" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "TESTO" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1921,79 +1939,77 @@ msgstr "" "Crea l'archivio con TESTO come nome di volume; durante l'elencazione o " "l'estrazione, usa TESTO come modello di glob per ogni volume" -#: src/tar.c:660 +#: src/tar.c:684 msgid "Compression options:" msgstr "Opzioni di compressione:" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "" "Usa il suffisso dell'archivio per determinare il programma di compressione" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "" "Non usa il suffisso dell'archivio per determinare il programma di " "compressione" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "PROG" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "Filtra attraverso PROG (deve accettare -d)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "Selezione dei file locali:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "Aggiunge FILE all'archivio (utile se il nome inizia con un trattino)" -#: src/tar.c:687 -msgid "DIR" -msgstr "DIR" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "Passa alla directory DIR" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "Prende i nomi da estrarre o creare dal file FILE" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "-T legge nomi terminati da NULL, disabilita -C" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "Disabilita l'effetto dell'opzione --null precedente" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" msgstr "" "Toglie i caratteri di citazione dai nomi dei file letti con -T (predefinito)" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" msgstr "Non toglie i caratteri di citazione dai nomi dei file letti con -T" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "MODELLO" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "Esclude i file i cui nomi corrispondono a MODELLO" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "Esclude i modelli elencati in FILE" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -2001,99 +2017,111 @@ msgstr "" "Esclude i contenuti delle directory contenenti CACHEDIR.TAG, a parte il " "file .TAG stesso" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "Esclude tutto quanto all'interno di directory contenenti CACHEDIR.TAG" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "Esclude le directory contenenti CACHEDIR.TAG" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" "Esclude i contenuti delle directory contenenti FILE, a parte FILE stesso " -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "Esclude tutto quanto all'interno di directory contenenti FILE" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "Esclude le directory contenenti FILE" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "Esclude le directory dei sistemi di controllo della versione" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "Esclude i file di backup e di blocco" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "Non entra automaticamente nelle directory" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "Resta nel file system locale durante la creazione dell'archivio" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "Entra ricorsivamente nelle directory (predefinito)" -#: src/tar.c:729 -#, fuzzy +#: src/tar.c:761 msgid "don't strip leading '/'s from file names" msgstr "Non rimuove le \"/\" iniziali dai nomi dei file" # (ndt) hmmm... non molto chiara... -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "" "Segue i collegamenti simbolici; archivia ed esegue il dump dei file a cui " "puntano" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "" "Segue i collegamenti fisici; archivia ed esegue il dump dei file a cui si " "riferiscono" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "NOME" -#: src/tar.c:735 -#, fuzzy +#: src/tar.c:767 msgid "begin at member MEMBER-NAME when reading the archive" -msgstr "Inizia dal membro NOME nell'archivio" +msgstr "Inizia dal membro NOME durante la lettura dell'archivio" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "Archivia solo i file più recenti di DATA-O-FILE" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "DATA" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "Confronta data e ora solo quando il contenuto è cambiato" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "CONTROLLO" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "Esegue un backup prima di rimuovere, usando il CONTROLLO di versione" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "STRINGA" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -2101,105 +2129,102 @@ msgstr "" "Esegue un backup prima di rimuovere, sovrascrivendo il suffisso \"~\" a meno " "che non sia sovrascritto dalla variabile d'ambiente SIMPLE_BACKUP_SUFFIX" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "Trasformazioni dei nomi di file:" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "" "Toglie NUMERO componenti iniziali dai nomi dei file durante l'estrazione" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "ESPRESSIONE" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "" "Usa un'ESPRESSIONE di sostituzione di sed per trasformare i nomi dei file" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "Opzioni di corrispondenza del nome del file (vale sia per i modelli di " "esclusione che inclusione):" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "Non fa differenza tra maiuscole e minuscole" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "I modelli corrispondono all'inizio del nome del file" -#: src/tar.c:767 -#, fuzzy +#: src/tar.c:799 msgid "patterns match after any '/' (default for exclusion)" msgstr "" -"I modelli corrispondono dopo ogni \"/\" (predefinito per le esclusioni)" +"I modelli corrispondono dopo qualsiasi \"/\" (predefinito per le esclusioni)" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "Considera diverse le maiuscole e le minuscole (predefinito)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "Utilizza i metacaratteri (predefinito per le esclusioni)" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "Corrispondenza letterale della stringa" -#: src/tar.c:775 -#, fuzzy +#: src/tar.c:807 msgid "wildcards do not match '/'" msgstr "I metacaratteri non corrispondono \"/\"" -#: src/tar.c:777 -#, fuzzy +#: src/tar.c:809 msgid "wildcards match '/' (default for exclusion)" msgstr "I metacaratteri corrispondono \"/\" (predefinito per le esclusioni)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Output informativo:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "Elenca prolissamente i file elaborati" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "PAROLACHIAVE" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "Controllo di avviso" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" "Visualizza un messaggio di avanzamento ogni NUMERO-esimo record (predefinito " "10)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "AZIONE" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "Esegue l'azione a ogni punto di controllo" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "Stampa un messaggio se non tutti i collegamenti sono archiviati" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "SEGNALE" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2211,35 +2236,35 @@ msgstr "" "sono: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 e SIGUSR2; sono accettati anche i " "nomi senza il prefisso SIG" -#: src/tar.c:802 +#: src/tar.c:834 msgid "print file modification times in UTC" msgstr "Stampa le date di modifica del file in formato UTC" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "Stampa la data del file in tutti i suoi dettagli" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "Invia l'output prolisso al FILE" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "Mostra il numero di blocco nell'archivio con ogni messaggio" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "Chiede conferma per ogni azione" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "Mostra le impostazioni predefinite di tar" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" -msgstr "" +msgstr "Mostra gli intervalli validi per i campi snapshot-file" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2247,33 +2272,33 @@ msgstr "" "All'elencazione o all'estrazione, elenca ogni directory che non corrisponde " "al criterio di ricerca" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "Mostra il nome del file o dell'archivio dopo la trasformazione" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "STILE" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "" "Imposta lo stile di citazione del nome; consultare più sotto per i valori di " "STILE consentiti" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "Caratteri di citazione aggiuntivi da STRINGA" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "Disabilita la citazione per i caratteri dalla STRINGA" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "Opzioni di compatibilità:" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2281,56 +2306,56 @@ msgstr "" "Alla creazione, uguale a --old-archive; all'estrazione, uguale a --no-same-" "owner" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "Altre opzioni:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "Disabilita l'uso di alcune opzioni potenzialmente dannose" -#: src/tar.c:978 -#, fuzzy +#: src/tar.c:1010 msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" msgstr "" -"Non è possibile indicare più di un'opzione \"-Acdtrux\" o \"--test-label\"" +"Non è possibile indicare più di un'opzione \"-Acdtrux\", \"--delete\" o \"--" +"test-label\"" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Conflitto tra le opzioni di compressione" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "Nome del segnale sconosciuto: %s" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "File campione della data non trovato" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Sostituzione di %s al posto del formato di data sconosciuto %s" -#: src/tar.c:1108 -#, fuzzy, c-format +#: src/tar.c:1140 +#, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "Opzione %s: la data \"%s\" viene considerata come %s" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "Filtra l'archivio attraverso %s" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "Argomenti validi per l'opzione --quoting-style sono:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2338,48 +2363,47 @@ msgstr "" "\n" "Questa versione di tar ha le seguenti impostazioni predefinite:\n" -#: src/tar.c:1295 -#, fuzzy +#: src/tar.c:1330 msgid "Invalid owner or group ID" -msgstr "Proprietario non valido" +msgstr "Proprietario o ID gruppo non valido" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Fattore del blocco non valido" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "Lunghezza del nastro non valida" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "Valore del livello incrementale non valido" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "Più di una data di soglia" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "Valore versione sparsa non valido" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve=\"system\" non è supportato su questa piattaforma" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "Il valore --checkpoint non è un intero" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Modo fornito sull'opzione non valido" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "Numero non valido" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" @@ -2387,151 +2411,140 @@ msgstr "" "L'opzione --preserve è deprecata, usare --preserve-permissions --preserve-" "order" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Dimensione del record non valida" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "La dimensione del record deve essere un multiplo di %d." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "Numero di elementi non valido" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "Consentita solo un'opzione --to-command" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "Argomento densità non corretto: \"%s\"" -#: src/tar.c:2133 -#, fuzzy, c-format +#: src/tar.c:2205 +#, c-format msgid "Unknown density: '%c'" msgstr "Densità sconosciuta: \"%c\"" -#: src/tar.c:2150 -#, fuzzy, c-format +#: src/tar.c:2222 +#, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "Le opzioni \"-[0-7][lmh]\" non sono gestite da questa versione di tar" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[FILE]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 #, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "L'opzione --%s non può essere usata con %s" + +#: src/tar.c:2389 +#, c-format msgid "Old option '%c' requires an argument." msgstr "La vecchia opzione \"%c\" richiede un argomento." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence non ha senso senza un elenco di file" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "--occurrence non può essere usata nel modo di operazioni richiesto" - -#: src/tar.c:2408 -#, fuzzy +#: src/tar.c:2490 msgid "Multiple archive files require '-M' option" msgstr "Archivi multipli richiedono l'opzione \"-M\"" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "Impossibile combinare --listed-incremental e --newer" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "L'opzione --level non è utilizzabile senza --listed-incremental" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "%s: l'etichetta di volume è troppo lunga (il limite è %lu byte)" msgstr[1] "%s: l'etichetta di volume è troppo lunga (il limite sono %lu byte)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Impossibile verificare archivi multi-volume" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Impossibile verificare archivi compressi" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "Il modello %s non può essere usato" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Impossibile usare archivi multi-volume compressi" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "Impossibile concatenare archivi compressi" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option può essere usata solo su archivi POSIX" -#: src/tar.c:2478 -#, fuzzy +#: src/tar.c:2560 msgid "--acls can be used only on POSIX archives" -msgstr "--pax-option può essere usata solo su archivi POSIX" +msgstr "--acls può essere usata solo su archivi POSIX" -#: src/tar.c:2483 -#, fuzzy +#: src/tar.c:2565 msgid "--selinux can be used only on POSIX archives" -msgstr "--pax-option può essere usata solo su archivi POSIX" +msgstr "--selinux può essere usata solo su archivi POSIX" -#: src/tar.c:2488 -#, fuzzy +#: src/tar.c:2570 msgid "--xattrs can be used only on POSIX archives" -msgstr "--pax-option può essere usata solo su archivi POSIX" +msgstr "--xattrs può essere usata solo su archivi POSIX" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "Il modello %s non può essere usato" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" +msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "" "La lunghezza del volume non può essere minore della dimensione del record" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "--preserve-order non è compatibile con --listed-incremental" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "Rifiuto totale di creare un archivio vuoto" -#: src/tar.c:2565 -#, fuzzy +#: src/tar.c:2669 msgid "Options '-Aru' are incompatible with '-f -'" msgstr "Le opzioni \"-Aru\" sono incompatibili con \"-f -\"" -#: src/tar.c:2660 -#, fuzzy +#: src/tar.c:2766 msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" msgstr "" -"È necessario specificare una delle opzioni \"-Acdtrux\" o \"--test-label\"" +"È necessario specificare una delle opzioni \"-Acdtrux\", \"--delete\" o \"--" +"test-label\"" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "Uscita con stato di fallimento in base agli errori precedenti" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" @@ -2539,52 +2552,52 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: il file si è ridotto di %s byte" msgstr[1] "%s: il file si è ridotto di %s byte" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "La parola chiave %s è sconosciuta o non ancora implementata" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" msgstr "Orario fuori dall'intervallo consentito" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "Il modello %s non può essere usato" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "La parola chiave %s non può essere sostituita" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "Intestazione estesa malformata: manca la lunghezza" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "La lunghezza dell'intestazione estesa %*s è fuori dall'intervallo" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "Intestazione estesa malformata: manca lo spazio dopo la lunghezza" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "Intestazione estesa malformata: manca il segno di uguale" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "Intestazione estesa malformata: manca un newline" -#: src/xheader.c:740 -#, fuzzy, c-format +#: src/xheader.c:741 +#, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "Parola chiave sconosciuta \"%s\" dell'intestazione estesa ignorata" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" @@ -2593,48 +2606,48 @@ msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "L'intestazione estesa %s=%s è fuori dall'intervallo %s..%s" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Intestazione estesa malformata: %s=%s non valido" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Intestazione estesa malformata: %s=%s in eccesso" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" "Intestazione estesa malformata: %s non valido: delimitatore %c non atteso" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" "Intestazione estesa malformata: %s non valido: numero dispari di valori" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "%s: timeout non valido" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "%s: azione di punto di controllo sconosciuta" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "lettura" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "scrittura" @@ -2642,7 +2655,7 @@ msgstr "scrittura" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "Punto di controllo di scrittura %u" @@ -2651,7 +2664,7 @@ msgstr "Punto di controllo di scrittura %u" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "Punto di controllo di lettura %u" @@ -2870,14 +2883,14 @@ msgid "cannot set time on `%s'" msgstr "impossibile impostare l'orario su \"%s\"" #: tests/genfile.c:692 -#, fuzzy, c-format +#, c-format msgid "cannot truncate `%s'" -msgstr "impossibile eseguire l'unlink di %s" +msgstr "impossibile troncare \"%s\"" #: tests/genfile.c:701 -#, fuzzy, c-format +#, c-format msgid "command failed: %s" -msgstr "comando \"%s\" non riuscito" +msgstr "comando non riuscito: \"%s\"" #: tests/genfile.c:706 #, c-format @@ -2919,24 +2932,14 @@ msgstr "Comando terminato\n" msgid "--stat requires file names" msgstr "--stat richiede i nomi dei file" -#~ msgid "Cannot get working directory" -#~ msgstr "Impossibile recuperare la directory di lavoro" - -#~ msgid "sort names to extract to match archive" -#~ msgstr "Ordina i nomi da estrarre come nell'archivio" - -# (ndt) oppure rendere snapshot come istantanea? -#~ msgid "Field too long while reading snapshot file" -#~ msgstr "Campo troppo lungo nel leggere il file di snapshot" - -#~ msgid "Read error in snapshot file" -#~ msgstr "Errore di lettura nel file di snapshot" +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "--occurrence non può essere usata con %s" -#~ msgid "Unexpected field value in snapshot file" -#~ msgstr "Valore del campo inatteso nel file di snapshot" +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "Impossibile combinare --listed-incremental e --newer" -#~ msgid "Extended header length is out of allowed range" -#~ msgstr "La lunghezza intestazione estesa è fuori dall'intervallo consentito" +#~ msgid "--verify cannot be used with %s" +#~ msgstr "--verify non può essere usata con %s" -#~ msgid "Invalid group" -#~ msgstr "Gruppo non valido" +#~ msgid "--preserve-order is not compatible with --listed-incremental" +#~ msgstr "--preserve-order non è compatibile con --listed-incremental" diff --git a/po/ja.gmo b/po/ja.gmo index e735a9d..6df323d 100644 Binary files a/po/ja.gmo and b/po/ja.gmo differ diff --git a/po/ja.po b/po/ja.po index b72dfa9..dc27243 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,18 +1,18 @@ -# Japanese messages for GNU tar 1.26 -# Copyright (C) 1999, 2000, 2001, 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. +# Japanese messages for GNU tar 1.27 +# Copyright (C) 1999, 2000, 2001, 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. # This file is distributed under the same license as the tar package. -# Masahito Yamaga , 2012. +# Masahito Yamaga , 2013. # derived from the version by # Daisuke Yamashita , 1999-2001. # Masahito Yamaga , 2007. # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" -"Project-Id-Version: GNU tar 1.26\n" +"Project-Id-Version: GNU tar 1.27\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" -"PO-Revision-Date: 2012-10-21 12:14+0900\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" +"PO-Revision-Date: 2013-10-07 08:18+0900\n" "Last-Translator: Masahito Yamaga \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -81,9 +81,9 @@ msgid " [OPTION...]" msgstr " [¥ª¥×¥·¥ç¥ó...]" #: gnu/argp-help.c:1686 -#, fuzzy, c-format +#, c-format msgid "Try '%s --help' or '%s --usage' for more information.\n" -msgstr "¤è¤ê¾Ü¤·¤¤¾ðÊó¤Ï `%s --help' ¤Þ¤¿¤Ï `%s --usage' ¤Ç.\n" +msgstr "¤è¤ê¾Ü¤·¤¤¾ðÊó¤Ï '%s --help' ¤Þ¤¿¤Ï '%s --usage' ¤Ç.\n" #: gnu/argp-help.c:1714 #, c-format @@ -102,7 +102,7 @@ msgstr " msgid "give a short usage message" msgstr "û¤¤»ÈÍÑË¡¥á¥Ã¥»¡¼¥¸¤òɽ¼¨" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "NAME" @@ -141,9 +141,9 @@ msgid "write error" msgstr "½ñ¤­¹þ¤ß¥¨¥é¡¼" #: gnu/getopt.c:549 gnu/getopt.c:578 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: ¥ª¥×¥·¥ç¥ó '%s' ¤Ï¤¢¤¤¤Þ¤¤¤Ç¤¹\n" +msgstr "%s: ¥ª¥×¥·¥ç¥ó '%s' ¤Ï¤¢¤¤¤Þ¤¤¤Ç¤¹. ²ÄǽÀ­¤¬¤¢¤ë¤Î¤Ï" #: gnu/getopt.c:626 gnu/getopt.c:630 #, c-format @@ -439,7 +439,7 @@ msgstr "GNU #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: %s ÉÔǽ" @@ -448,56 +448,56 @@ msgstr "%s: %s #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: ·Ù¹ð: %s ÉÔǽ" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: ¥â¡¼¥É¤ò %s ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: uid %lu gid %lu ¤Ë½êÍ­¼Ô¤òÊѹ¹¤Ç¤­¤Þ¤»¤ó" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: %s ¤Ë¥Ï¡¼¥É¥ê¥ó¥¯¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: %s ¥Ð¥¤¥ÈÌܤÇÆɤ߹þ¤ß¥¨¥é¡¼ (%lu ¥Ð¥¤¥ÈÆɤ߹þ¤ßÃæ)" msgstr[1] "%s: %s ¥Ð¥¤¥ÈÌܤÇÆɤ߹þ¤ß¥¨¥é¡¼ (%lu ¥Ð¥¤¥ÈÆɤ߹þ¤ßÃæ)" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: ·Ù¹ð: %s ¥Ð¥¤¥ÈÌܤÇÆɤ߹þ¤ß¥¨¥é¡¼ (%lu ¥Ð¥¤¥ÈÆɤ߹þ¤ßÃæ)" msgstr[1] "%s: ·Ù¹ð: %s ¥Ð¥¤¥ÈÌܤÇÆɤ߹þ¤ß¥¨¥é¡¼ (%lu ¥Ð¥¤¥ÈÆɤ߹þ¤ßÃæ)" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: %s ¤Ø¤Î seek ¤¬¤Ç¤­¤Þ¤»¤ó" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: ·Ù¹ð: %s ¤Ø¤Î seek ¤¬¤Ç¤­¤Þ¤»¤ó" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: `%s' ¤Ø¤Î¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤¬ºî¤ì¤Þ¤»¤ó" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -543,9 +543,9 @@ msgid "Cannot connect to %s: resolve failed" msgstr "%s ¤ËÀܳ¤Ç¤­¤Þ¤»¤ó: ̾Á°²ò·è¼ºÇÔ" #: lib/rtapelib.c:502 -#, fuzzy, c-format +#, c-format msgid "Cannot redirect files for remote shell" -msgstr "±ó³Ö¥·¥§¥ë¤¬¼Â¹Ô¤Ç¤­¤Þ¤»¤ó" +msgstr "±ó³Ö¥·¥§¥ë¤ËÂФ·¤Æ¥Õ¥¡¥¤¥ë¤ò¥ê¥À¥¤¥ì¥¯¥È¤Ç¤­¤Þ¤»¤ó" #: lib/rtapelib.c:516 #, c-format @@ -596,8 +596,8 @@ msgstr "ͽ msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "±ó³Ö¥×¥í¥»¥¹¤«¤é¤ÎÌ¿Îá¤ò¼õ¤±ÉÕ¤±¤Æ¥Æ¡¼¥×¥É¥é¥¤¥Ö¤òÁàºî" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "NUMBER" @@ -605,10 +605,10 @@ msgstr "NUMBER" msgid "set debug level" msgstr "¥Ç¥Ð¥Ã¥°¥ì¥Ù¥ë¤òÀßÄê" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "FILE" @@ -630,104 +630,112 @@ msgstr " msgid "Garbage command" msgstr "ÉÔÍפʥ³¥Þ¥ó¥É" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "¤³¤ì¤Ï tar ¥¢¡¼¥«¥¤¥Ö¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹" -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" -msgstr "Áí½ñ¤­½Ð¤·¥Ð¥¤¥È¿ô" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" msgstr "ÁíÆɤ߹þ¤ß¥Ð¥¤¥È¿ô" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "Áí½ñ¤­½Ð¤·¥Ð¥¤¥È¿ô" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Áíºï½ü¥Ð¥¤¥È¿ô: %s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(¥Ñ¥¤¥×)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "record_size ¤¬Ìµ¸ú¤ÊÃͤǤ¹" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "¥¢¡¼¥«¥¤¥Ö̾¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "ɸ½àÆþ½ÐÎϤΥ¢¡¼¥«¥¤¥Ö¤Ï¸¡¾Ú¤Ç¤­¤Þ¤»¤ó" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "¥¢¡¼¥«¥¤¥Ö¤Ï°µ½Ì¤µ¤ì¤Æ¤¤¤Þ¤¹. %s ¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "°µ½Ì¤µ¤ì¤¿¥¢¡¼¥«¥¤¥Ö¤Ï¥¢¥Ã¥×¥Ç¡¼¥È¤Ç¤­¤Þ¤»¤ó" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "¥Æ¡¼¥×¤ÎÀèƬ¤Ç¤¹. ½èÍý¤òÃæ»ß¤·¤Þ¤¹" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "¥¨¥é¡¼¤¬Â¿¤¹¤®¤Þ¤¹. ½èÍý¤òÃæ»ß¤·¤Þ¤¹" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "µ­Ï¿¥µ¥¤¥º = %lu ¥Ö¥í¥Ã¥¯" msgstr[1] "µ­Ï¿¥µ¥¤¥º = %lu ¥Ö¥í¥Ã¥¯" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "¥¢¡¼¥«¥¤¥ÖÆâ¤Î¥¢¥é¥¤¥ó¥á¥ó¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¥Ö¥í¥Ã¥¯ (%lu ¥Ð¥¤¥È)" msgstr[1] "¥¢¡¼¥«¥¤¥ÖÆâ¤Î¥¢¥é¥¤¥ó¥á¥ó¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¥Ö¥í¥Ã¥¯ (%lu ¥Ð¥¤¥È)" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" "¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤ò¸å¤íÊý¸þ¤ËÌ᤻¤Þ¤»¤ó. -i ¤Ê¤·¤Ç¤ÏÆɤá¤Ê¤¤¤«¤âÃΤì¤Þ¤»¤ó." -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek ¤òµ­Ï¿¤Î¶­³¦¤Ç»ß¤á¤Þ¤»¤ó" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: ̵¸ú¤Ê¥Ü¥ê¥å¡¼¥àÈÖ¹æ¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "¥Ü¥ê¥å¡¼¥àÈֹ椬¥ª¡¼¥Ð¡¼¥Õ¥í¡¼¤·¤Þ¤·¤¿" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "¥Ü¥ê¥å¡¼¥à #%d (%s) ¤ò½àÈ÷¤·¤Þ¤¹. ¥ê¥¿¡¼¥ó¥­¡¼¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "¥æ¡¼¥¶¤¬±þÅú¤¹¤ë EOF ¤¬É¬ÍפȤʤê¤Þ¤¹" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "·Ù¹ð: ¥¢¡¼¥«¥¤¥Ö¤¬ÉÔ´°Á´¤Ç¤¹" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -739,67 +747,67 @@ msgstr "" " q tar ¤ò½ªÎ»\n" " y ¤Þ¤¿¤Ï²þ¹Ô Áàºî¤ò·Ñ³\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! ¥µ¥Ö¥·¥§¥ë¤òµ¯Æ°\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? ¤³¤Î¥ê¥¹¥È¤òɽ¼¨\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "¿·¤·¤¤¥Ü¥ê¥å¡¼¥à¤¬¤¢¤ê¤Þ¤»¤ó. ½ªÎ»¤·¤Þ¤¹.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "¥Õ¥¡¥¤¥ë̾¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó. ¤â¤¦°ìÅÙ.\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "ÉÔÀµ¤ÊÆþÎÏ. ? ¤Ç¥Ø¥ë¥×¤òɽ¼¨\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "%s ¥³¥Þ¥ó¥É¤¬¼ºÇÔ¤·¤Þ¤·¤¿" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" "%s ¤Ï¤³¤Î¥Ü¥ê¥å¡¼¥à¾å¤Ç¤ª¤½¤é¤¯Ï¢Â³¤·¤Æ¤¤¤Þ¤¹: ¥Ø¥Ã¥À¤Ï¾Êά¤µ¤ì¤¿Ì¾Á°¤ò´Þ¤ó¤Ç" "¤¤¤Þ¤¹" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s ¤Ï¤³¤Î¥Ü¥ê¥å¡¼¥à¾å¤ÇϢ³¤·¤Æ¤¤¤Þ¤»¤ó" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s ¤ÏÉÔÀµ¤Ê¥µ¥¤¥º¤Ç¤¹ (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "¤³¤Î¥Ü¥ê¥å¡¼¥à¤ÏϢ³¤·¤Æ¤¤¤Þ¤»¤ó (%s - %s != %s)" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "¥¢¡¼¥«¥¤¥Ö¤Ï %s ¤Ë°ìÃפ¹¤ë¥é¥Ù¥ë¤¬ÉÕ¤¤¤Æ¤¤¤Þ¤»¤ó" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "¥Ü¥ê¥å¡¼¥à %s ¤Ï %s ¤Ë°ìÃפ·¤Þ¤»¤ó" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -807,7 +815,7 @@ msgstr "" "%s: ¥Õ¥¡¥¤¥ë̾¤¬Ä¹²á¤®¤Æ GNU ¥Þ¥ë¥Á¥Ü¥ê¥å¡¼¥à¥Ø¥Ã¥À¤ËÊݸ¤Ç¤­¤Ê¤¤¤Î¤ÇÀÚ¤ê¼Î¤Æ" "¤Þ¤¹" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "½ñ¤­¹þ¤ß¤¬¥Ö¥í¥Ã¥¯¶­³¦¤Ç½ª¤ï¤Ã¤Æ¤¤¤Þ¤»¤ó" @@ -818,16 +826,16 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "%lu ¥Ð¥¤¥È¤À¤±¤ò %lu ¥Ð¥¤¥È¤«¤éÆɤ߹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤·¤¿" msgstr[1] "%lu ¥Ð¥¤¥È¤À¤±¤ò %lu ¥Ð¥¤¥È¤«¤éÆɤ߹þ¤à¤³¤È¤¬¤Ç¤­¤Þ¤·¤¿" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "ÆâÍƤ¬°Û¤Ê¤ê¤Þ¤¹" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "¥¢¡¼¥«¥¤¥ÖÃæ¤Ëͽ´ü¤»¤Ì EOF ¤¬¤¢¤ê¤Þ¤¹" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "¥Õ¥¡¥¤¥ë¥¿¥¤¥×¤¬°Û¤Ê¤ê¤Þ¤¹" @@ -847,7 +855,7 @@ msgstr " msgid "Mod time differs" msgstr "ºÇ½ª½¤Àµ»þ¹ï¤¬°Û¤Ê¤ê¤Þ¤¹" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "¥µ¥¤¥º¤¬°Û¤Ê¤ê¤Þ¤¹" @@ -864,36 +872,36 @@ msgstr " msgid "Device number differs" msgstr "¥Ç¥Ð¥¤¥¹Èֹ椬°ã¤¤¤Þ¤¹" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "¸¡¾Ú" -#: src/compare.c:471 -#, fuzzy, c-format +#: src/compare.c:473 +#, c-format msgid "%s: Unknown file type '%c', diffed as normal file" -msgstr "%s: ̤ÃΤΥե¡¥¤¥ë¥¿¥¤¥× `%c', Ä̾ï¥Õ¥¡¥¤¥ë¤Èº¹Ê¬¤ò¼è¤ê¤Þ¤¹" +msgstr "%s: ̤ÃΤΥե¡¥¤¥ë¥¿¥¤¥× '%c', Ä̾ï¥Õ¥¡¥¤¥ë¤Èº¹Ê¬¤ò¼è¤ê¤Þ¤¹" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "¥¢¡¼¥«¥¤¥ÖÃæ¤ËÀÜƬ¼­¤¬ºï½ü¤µ¤ì¤¿¥Õ¥¡¥¤¥ë̾¤¬¤¢¤ê¤Þ¤¹." -#: src/compare.c:533 +#: src/compare.c:535 msgid "Archive contains transformed file names." msgstr "¥¢¡¼¥«¥¤¥Ö¤ËÊÑ´¹¤µ¤ì¤¿¥Õ¥¡¥¤¥ë̾¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹" -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "¸µ¤Î¥Õ¥¡¥¤¥ë¤Î½êºß³Îǧ¤Ë¼ºÇÔ¤·¤¿²ÄǽÀ­¤¬¤¢¤ê¤Þ¤¹." -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "³Îǧ¼ºÇÔ: %d ¸Ä¤Î̵¸ú¤Ê¥Ø¥Ã¥À¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿" msgstr[1] "³Îǧ¼ºÇÔ: %d ¸Ä¤Î̵¸ú¤Ê¥Ø¥Ã¥À¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "%s ¤Ë¸ÉΩ¤·¤¿¥¼¥í¥Ö¥í¥Ã¥¯" @@ -939,55 +947,55 @@ msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "%s: %s ¥Ð¥¤¥È¾®¤µ¤¯¤Ê¤Ã¤¿¤Î¤Ç¡¢¥¼¥í¤ÇËä¤á¤Þ¤¹" msgstr[1] "%s: %s ¥Ð¥¤¥È¾®¤µ¤¯¤Ê¤Ã¤¿¤Î¤Ç¡¢¥¼¥í¤ÇËä¤á¤Þ¤¹" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: ¥Õ¥¡¥¤¥ë¤Ï°Û¤Ê¤ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Ë¤¢¤ë¤Î¤Ç¥À¥ó¥×¤·¤Þ¤»¤ó" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "ÆâÍƤò¥À¥ó¥×¤·¤Þ¤»¤ó" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: ̤ÃΤΥե¡¥¤¥ë·Á¼°; ¥Õ¥¡¥¤¥ë¤Ï̵»ë¤µ¤ì¤Þ¤¹" -#: src/create.c:1549 +#: src/create.c:1551 #, c-format msgid "Missing links to %s." msgstr "%s ¤Ø¤Î¥ê¥ó¥¯¤¬¤¢¤ê¤Þ¤»¤ó." -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: Êѹ¹¤µ¤ì¤Æ¤¤¤Ê¤¤¤Î¤Ç¥À¥ó¥×¤·¤Þ¤»¤ó" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: ¤Ï¥¢¡¼¥«¥¤¥Ö¤Ê¤Î¤Ç¥À¥ó¥×¤·¤Þ¤»¤ó" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ò¥À¥ó¥×¤·¤Þ¤»¤ó" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: Æɤ߹þ¤ó¤À¥Õ¥¡¥¤¥ë¤¬Êѹ¹¤µ¤ì¤Æ¤¤¤Þ¤¹" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: ¥½¥±¥Ã¥È¤Ï̵»ë¤·¤Þ¤¹" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: door ¤Ï̵»ë¤·¤Þ¤¹" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "¼¡¤Î¥Ø¥Ã¥À¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹" @@ -1013,7 +1021,7 @@ msgstr "%s: #: src/extract.c:705 #, c-format msgid "%s: skipping existing file" -msgstr "" +msgstr "%s: ´û¸¥Õ¥¡¥¤¥ë¤ò¥¹¥­¥Ã¥×¤·¤Þ¤¹" #: src/extract.c:821 #, c-format @@ -1033,12 +1041,12 @@ msgstr " msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: ¼è¤ê½Ð¤»¤Þ¤»¤ó -- ¥Õ¥¡¥¤¥ë¤ÏÊ̤Υܥê¥å¡¼¥à¤«¤é³¤¤¤Æ¤¤¤Þ¤¹" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" msgstr "ͽ´ü¤»¤ÌŤ¤Ì¾Á°¥Ø¥Ã¥À" #: src/extract.c:1542 -#, fuzzy, c-format +#, c-format msgid "%s: Unknown file type '%c', extracted as normal file" msgstr "%s: ̤ÃΤΥե¡¥¤¥ë¥¿¥¤¥× '%c', Ä̾ï¥Õ¥¡¥¤¥ë¤È¤·¤ÆÃê½Ð" @@ -1068,287 +1076,287 @@ msgid "%s: Directory is new" msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¤Ï¿·¤·¤¯ºî¤é¤ì¤Þ¤·¤¿" #: src/incremen.c:566 -#, fuzzy, c-format +#, c-format msgid "%s: directory is on a different filesystem; not dumped" -msgstr "%s: ¥Õ¥¡¥¤¥ë¤Ï°Û¤Ê¤ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Ë¤¢¤ë¤Î¤Ç¥À¥ó¥×¤·¤Þ¤»¤ó" +msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¤Ï°Û¤Ê¤ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Ë¤¢¤ë¤Î¤Ç¥À¥ó¥×¤·¤Þ¤»¤ó" #: src/incremen.c:587 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê̾¤¬Êѹ¹¤µ¤ì¤Þ¤·¤¿" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "̵¸ú¤Ê¥¿¥¤¥à¥¹¥¿¥ó¥×" -#: src/incremen.c:1045 -#, fuzzy +#: src/incremen.c:1047 msgid "Invalid modification time" -msgstr "ÉÔÀµ¤ÊºÇ½ª¹¹¿·»þ¹ï (ÉÃ)" +msgstr "ÉÔÀµ¤ÊºÇ½ª¹¹¿·»þ¹ï" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "ÉÔÀµ¤ÊºÇ½ª¹¹¿·»þ¹ï (¥Ê¥ÎÉÃ)" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "̵¸ú¤Ê¥Ç¥Ð¥¤¥¹ÈÖ¹æ¤Ç¤¹" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "̵¸ú¤Ê inode ÈÖ¹æ" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" -msgstr "" +msgstr "%s: ¥Ð¥¤¥È %s: %s %.*s... Ĺ²á¤®¤Þ¤¹" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" msgstr "¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¥Õ¥¡¥¤¥ë¤Ëͽ´ü¤»¤Ì EOF" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" -msgstr "" +msgstr "%s: ¥Ð¥¤¥È %s: %s %s ¤¬ÉÔÀµ¤Ê¥Ð¥¤¥È 0x%02x ¤Ë³¤¤¤Æ¤¤¤Þ¤¹" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" +"%s: ¥Ð¥¤¥È %s: (ÀµÅö¤ÊÈÏ°Ï %s..%s)\n" +"\t%s %s" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" -msgstr "" +msgstr "%s: ¥Ð¥¤¥È %s: %s %s" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" -msgstr "" +msgstr "%s: ¥Ð¥¤¥È %s: %s" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "½ªÃ¼µ­Ï¿¤Ê¤·" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "ÉÔÀµ¤ÊÁýʬ¥Õ¥¡¥¤¥ë·Á¼°" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "̤¼ÂÁõ¤ÎÁýʬ·Á¼°¥Ð¡¼¥¸¥ç¥ó: %" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: '%c' ¤¬¤¢¤ë¤Ù¤­¤È¤³¤í¤Ë %#3o" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: 'X' ¤¬½ÅÊ£" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: 'R' ¤Ë¶õ¤Î̾Á°" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: 'T' ¤¬ 'R' ¤ÎÁ°¤Ë¤Ê¤¤" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: 'T' ¤Ë¶õ¤Î̾Á°" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: '%c' ¤¬¤¢¤ë¤Ù¤­¤È¤³¤í¤Ë¥Ç¡¼¥¿¤Î½ªÃ¼" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "ÉÔÀµ·Á¼°¤Î dumpdir: 'X' ¤¬Ì¤»ÈÍÑ" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "¥Æ¥ó¥×¥ì¡¼¥È %s ¤ò»È¤Ã¤Æ°ì»þ¥Ç¥£¥ì¥¯¥È¥ê¤òºî¤ì¤Þ¤»¤ó" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¤òºï½ü¤·¤Þ¤»¤ó: ¾õÂÖ¤¬Ê¬¤«¤ê¤Þ¤»¤ó" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: ¥Ç¥£¥ì¥¯¥È¥ê¤Ï°Û¤Ê¤ë¥Ç¥Ð¥¤¥¹¾å¤Ë¤¢¤ë¤Î¤Ç¾Ãµî¤·¤Þ¤»¤ó" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s ¤òºï½ü\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: ºï½ü¤Ç¤­¤Þ¤»¤ó" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: ¾Êά¤·¤Þ¤¹" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "¥Ö¥í¥Ã¥¯ %s: ** NUL ¤Î¥Ö¥í¥Ã¥¯ **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "¥Ö¥í¥Ã¥¯ %s: ** ¥Õ¥¡¥¤¥ë¤Î½ªÃ¼ **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "¥Ö¥í¥Ã¥¯ %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "¿ôÃÍ %s ¤È¤Ê¤ë¤Ù¤­¥Ø¥Ã¥À°ÌÃÖ¤¬¶õ¤Ë¤Ê¤Ã¤Æ¤¤¤Þ¤¹" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "8 ¿Ê¿ôÃÍ %.*s ¤Ï %s ¤ÎÈϰϳ°¤Ç¤¹ -- 2 ¤ÎÊä¿ô¤È¸«¤Ê¤·¤Þ¤¹" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "8 ¿Ê¿ôÃÍ %.*s ¤Ï %s ¤ÎÈϰϳ°¤Ç¤¹" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "¥¢¡¼¥«¥¤¥Ö¤ËÇѤ줿 base-64 ¥Ø¥Ã¥À¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Éä¹æÉÕ¤­ base-64 ʸ»úÎó %s ¤Ï %s ¤ÎÈϰϳ°¤Ç¤¹" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "base-256 ÃÍ¤Ï %s ¤ÎÈϰϳ°¤Ç¤¹" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "¥¢¡¼¥«¥¤¥Ö¤Ë %.*s ¤¬´Þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¤³¤³¤Ï¿ôÃÍ %s ¤È¤Ê¤ë¤Ï¤º¤Ç¤¹" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "¥¢¡¼¥«¥¤¥Ö¤ÎÃÍ %s ¤Ï %s ¤ÎÈÏ°Ï %s..%s Æâ¤Ë¤¢¤ê¤Þ¤»¤ó" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " %s ¤Ø¤Î¥ê¥ó¥¯\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " ÉÔÌÀ¤Ê¥Õ¥¡¥¤¥ë¥¿¥¤¥× %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--Ť¤¥ê¥ó¥¯--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--Ť¤Ì¾Á°--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--¥Ü¥ê¥å¡¼¥à¥Ø¥Ã¥À--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--¥Ð¥¤¥È %s ¤ÇϢ³--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤òºîÀ®:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "̾Á°¤ò %s ¤«¤é %s ¤ËÊѹ¹¤·¤Þ¤¹\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: ̾Á°¤ò %s ¤ËÊѹ¹¤Ç¤­¤Þ¤»¤ó" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "̾Á°¤ò %s ¤«¤é %s ¤ËÌᤷ¤Þ¤¹\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Æɤ߹þ¤ß°ÊÁ°¤Ëºï½ü¤µ¤ì¤Þ¤·¤¿" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "»Ò¥×¥í¥»¥¹" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "¥×¥í¥»¥¹´Ö¥Á¥ã¥Í¥ë" #: src/names.c:360 -#, fuzzy msgid "command line" -msgstr "%s ¥³¥Þ¥ó¥É¤¬¼ºÇÔ¤·¤Þ¤·¤¿" +msgstr "¥³¥Þ¥ó¥É¥é¥¤¥ó" #: src/names.c:378 -#, fuzzy, c-format +#, c-format msgid "%s: file list requested from %s already read from %s" -msgstr "%s: ¥Õ¥¡¥¤¥ë°ìÍ÷¤Ï´û¤ËÆɤ߹þ¤ßºÑ¤ß" +msgstr "%s: %s ¤«¤éÍ׵ᤵ¤ì¤¿¥Õ¥¡¥¤¥ë°ìÍ÷¤Ï´û¤Ë %s ¤«¤éÆɤ߹þ¤ßºÑ¤ß" -#: src/names.c:448 -#, fuzzy, c-format +#: src/names.c:448 src/checkpoint.c:274 +#, c-format msgid "cannot split string '%s': %s" -msgstr "`%s' ¤Ë»þ¹ï¤òÀßÄê¤Ç¤­¤Þ¤»¤ó" +msgstr "ʸ»úÎó '%s' ¤òʬ³ä¤Ç¤­¤Þ¤»¤ó: %s" #: src/names.c:490 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: Æɤ߹þ¤Þ¤ì¤¿¥Õ¥¡¥¤¥ë̾¤Ë¥Ì¥ëʸ»ú" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "¥Ñ¥¿¡¼¥ó¥Þ¥Ã¥Á¤Îʸ»ú¤¬¥Õ¥¡¥¤¥ë̾¤Ë»È¤ï¤ì¤Æ¤¤¤Þ¤¹" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1356,53 +1364,52 @@ msgstr "" "¥Ñ¥¿¡¼¥ó¥Þ¥Ã¥Á¤òÍ­¸ú¤Ë¤¹¤ë¤Ê¤é --wildcards, ¤³¤Î·Ù¹ð¤òÍ޻ߤ¹¤ë¤Ê¤é --no-" "wildcards ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: ¥¢¡¼¥«¥¤¥ÖÆâ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: ¥¢¡¼¥«¥¤¥ÖÆâ¤Ë¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: src/names.c:876 +#: src/names.c:879 #, c-format msgid "Archive label mismatch" msgstr "¥¢¡¼¥«¥¤¥Ö¥é¥Ù¥ë¤¬°ìÃפ·¤Þ¤»¤ó" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "¥Õ¥¡¥¤¥ë¥ê¥¹¥ÈÆâ¤Ç -C ¥ª¥×¥·¥ç¥ó¤Ï --listed-incremental ¤È°ì½ï¤Ë»È¤¨¤Þ¤»¤ó" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "-C ¥ª¥×¥·¥ç¥ó¤Ï 1¤Ä¤À¤±¤Ê¤é --listed-incremental ¤È°ì½ï¤Ë»È¤¨¤Þ¤¹" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" -msgstr "¥ª¥×¥·¥ç¥ó `-%s' ¤È `-%s' ¤Ï¤É¤Á¤é¤âɸ½àÆþÎϤ¬É¬ÍפǤ¹" +msgid "Options '%s' and '%s' both want standard input" +msgstr "¥ª¥×¥·¥ç¥ó '-%s' ¤È '-%s' ¤Ï¤É¤Á¤é¤âɸ½àÆþÎϤ¬É¬ÍפǤ¹" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s: ̵¸ú¤Ê¥¢¡¼¥«¥¤¥Ö·Á¼°" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "GNU ÆÃÍ­¤Îµ¡Ç½¤Ï¡¢Èó¸ß´¹¤Ê·Á¼°¤òɬÍפȤ·¤Þ¤¹" -#: src/tar.c:255 -#, fuzzy, c-format +#: src/tar.c:264 +#, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." -msgstr "ÉÔÌÀ¤Ê°úÍÑ·Á¼° `%s', `%s --quoting-style=help' ¤Ç°ìÍ÷ɽ¼¨." +msgstr "ÉÔÌÀ¤Ê°úÍÑ·Á¼° '%s', '%s --quoting-style=help' ¤Ç°ìÍ÷ɽ¼¨." -#: src/tar.c:364 -#, fuzzy +#: src/tar.c:378 msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1412,17 +1419,17 @@ msgid "" " tar -tvf archive.tar # List all files in archive.tar verbosely.\n" " tar -xf archive.tar # Extract all files from archive.tar.\n" msgstr "" -"GNU `tar' ¤Ï¿¤¯¤Î¥Õ¥¡¥¤¥ë¤ò°ì¤Ä¤Î¥Æ¡¼¥×¤ä¥Ç¥£¥¹¥¯¤Î¥¢¡¼¥«¥¤¥Ö¤Ë¤Þ¤È¤á, ¹¹" +"GNU 'tar' ¤Ï¿¤¯¤Î¥Õ¥¡¥¤¥ë¤ò°ì¤Ä¤Î¥Æ¡¼¥×¤ä¥Ç¥£¥¹¥¯¤Î¥¢¡¼¥«¥¤¥Ö¤Ë¤Þ¤È¤á, ¹¹" "¤Ë\n" "¤½¤³¤«¤é¸Ä¡¹¤Î¥Õ¥¡¥¤¥ë¤ò¼è¤ê½Ð¤¹¤³¤È¤¬¤Ç¤­¤Þ¤¹.\n" "\n" "Îã:\n" -" tar -cf archive.tar foo bar # ¥Õ¥¡¥¤¥ë foo ¤È bar ¤«¤é archive.tar ºîÀ®\n" -" tar -tvf archive.tar # archive.tar Æâ¤ÎÁ´¥Õ¥¡¥¤¥ë¤ò¾Ü¤·¤¯°ìÍ÷ɽ¼¨\n" -" tar -xf archive.tar # archive.tar ¤«¤éÁ´¥Õ¥¡¥¤¥ë¤ò¼è¤ê½Ð¤¹\n" +" tar -cf archive.tar foo bar # ¥Õ¥¡¥¤¥ë foo ¤È bar ¤«¤é archive.tar ºîÀ®.\n" +" tar -tvf archive.tar # archive.tar Æâ¤ÎÁ´¥Õ¥¡¥¤¥ë¤ò¾Ü¤·¤¯°ìÍ÷ɽ" +"¼¨.\n" +" tar -xf archive.tar # archive.tar ¤«¤éÁ´¥Õ¥¡¥¤¥ë¤ò¼è¤ê½Ð¤¹.\n" -#: src/tar.c:373 -#, fuzzy +#: src/tar.c:387 msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" "The version control may be set with --backup or VERSION_CONTROL, values " @@ -1434,7 +1441,7 @@ msgid "" " never, simple always make simple backups\n" msgstr "" "--suffix ¤ä SIMPLE_BACKUP_SUFFIX ¤Ç»ØÄꤵ¤ì¤Ê¤¤¸Â¤ê, ¥Ð¥Ã¥¯¥¢¥Ã¥×¤ÎÀÜÈø¼­¤Ï\n" -" `~' ¤Ç¤¹. ¤Þ¤¿, ¥Ð¡¼¥¸¥ç¥ó´ÉÍý¤Ï --backup ¤ä VERSION_CONTROL ¤Ë¼¡¤Î¤è¤¦¤Ê\n" +"'~' ¤Ç¤¹. ¤Þ¤¿, ¥Ð¡¼¥¸¥ç¥ó´ÉÍý¤Ï --backup ¤ä VERSION_CONTROL ¤Ë¼¡¤Î¤è¤¦¤Ê\n" "Ãͤò»ØÄꤹ¤ë¤³¤È¤ÇÀßÄê¤Ç¤­¤Þ¤¹.\n" "\n" " none, off ¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò¼è¤é¤Ê¤¤\n" @@ -1443,79 +1450,79 @@ msgstr "" " ¤½¤¦¤Ç¤Ê¤±¤ì¤Ðñ¤Ë¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò¼è¤ë\n" " never, simple ¾ï¤Ëñ½ã¤Ê¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò¼è¤ë\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "¼çÁàºî¥â¡¼¥É:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "¥¢¡¼¥«¥¤¥Ö¤ÎÆâÍƤò°ìÍ÷ɽ¼¨" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "¥¢¡¼¥«¥¤¥Ö¤«¤é¥Õ¥¡¥¤¥ë¤òÃê½Ð" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "¿·¤·¤¤¥¢¡¼¥«¥¤¥Ö¤òºîÀ®" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "¥¢¡¼¥«¥¤¥Ö¤È¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤È¤Î°ã¤¤¤ò¸«ÉÕ¤±¤ë" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "¥¢¡¼¥«¥¤¥Ö¤ÎËöÈø¤Ë¥Õ¥¡¥¤¥ë¤òÄɲÃ" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "¥¢¡¼¥«¥¤¥ÖÆâ¤Ë¤¢¤ë¥Õ¥¡¥¤¥ë¤è¤ê¿·¤·¤¤¥Õ¥¡¥¤¥ë¤Î¤ß¤òÄɲÃ" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "¥¢¡¼¥«¥¤¥Ö¤Ë tar ¥Õ¥¡¥¤¥ë¤òÄɲÃ" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "¥¢¡¼¥«¥¤¥Ö¤«¤éºï½ü (¼§µ¤¥Æ¡¼¥×¾å¤Ç¤Ï¥À¥á!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "¥¢¡¼¥«¥¤¥Ö¤Î¥Ü¥ê¥å¡¼¥à¥é¥Ù¥ë¤ò¥Æ¥¹¥È¤·¤Æ½ªÎ»" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "Áàºî¥ª¥×¥·¥ç¥ó¤ËÂФ¹¤ëÉղõ¡Ç½:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "¤Þ¤Ð¤é¤Ë¸ºß¤¹¤ë¥Õ¥¡¥¤¥ë¤ò¸ú²ÌŪ¤Ë½èÍý" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "MAJOR[.MINOR]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "¤Þ¤Ð¤é (sparse) ·Á¼°¤Î¥Ð¡¼¥¸¥ç¥ó¤òÀßÄê (--sparse ¤Î°ÕÌ£¤ò´Þ¤à)" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "¸Å¤¤ GNU ·Á¼°¤Î¥¤¥ó¥¯¥ê¥á¥ó¥¿¥ë¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò½èÍý" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "¿·¤·¤¤ GNU ·Á¼°¤Î¥¤¥ó¥¯¥ê¥á¥ó¥¿¥ë¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò½èÍý" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "ºî¤é¤ì¤¿ listed-incremental ¥¢¡¼¥«¥¤¥Ö¤ËÂФ¹¤ë¥À¥ó¥×¥ì¥Ù¥ë" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "Æɤ߹þ¤á¤Ê¤¤¥Õ¥¡¥¤¥ë¤Ë¤ª¤¤¤ÆÈó¥¼¥í¤Ç½ªÎ»¤·¤Þ¤»¤ó" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1527,130 +1534,135 @@ msgstr "" "¥Õ¥¡¥¤¥ë°ìÍ÷¤¬¥³¥Þ¥ó¥É¥é¥¤¥ó¤« -T ¥ª¥×¥·¥ç¥ó·Ðͳ¤Î¤É¤Á¤é¤«¤Ç»ØÄꤵ¤ì¤¿¾ì¹ç¤Î" "¤ßÍ­¸ú. NUMBER ¤Ïɸ½à¤Ç 1." -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "¥¢¡¼¥«¥¤¥Ö¤Ï¸¡º÷²Äǽ" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "¥¢¡¼¥«¥¤¥Ö¤Ï¸¡º÷²Äǽ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "¥¤¥ó¥¯¥ê¥á¥ó¥¿¥ë¥¢¡¼¥«¥¤¥ÖºîÀ®»þ¤Ë¥Ç¥Ð¥¤¥¹ÈÖ¹æ¤ò¥Á¥§¥Ã¥¯¤·¤Ê¤¤" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "¥¤¥ó¥¯¥ê¥á¥ó¥¿¥ë¥¢¡¼¥«¥¤¥ÖºîÀ®»þ¤Ë¥Ç¥Ð¥¤¥¹ÈÖ¹æ¤ò¥Á¥§¥Ã¥¯¤¹¤ë (ɸ½à)" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "À©¸æ¤ò¾å½ñ¤­:" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "¥¢¡¼¥«¥¤¥Ö¤ò½ñ¤­½Ð¤·¤¿¸å¤Ë¸¡¾Ú" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "¥Õ¥¡¥¤¥ë¤ò¥¢¡¼¥«¥¤¥Ö¤Ë²Ã¤¨¤¿¸å¤Çºï½ü" -#: src/tar.c:471 -#, fuzzy +#: src/tar.c:485 msgid "don't replace existing files when extracting, treat them as errors" -msgstr "¼è¤ê½Ð¤¹ºÝ¤Ë´û¸¤Î¥Õ¥¡¥¤¥ë¤òÃÖ¤­´¹¤¨¤Ê¤¤" +msgstr "¼è¤ê½Ð¤¹ºÝ¤Ë´û¸¤Î¥Õ¥¡¥¤¥ë¤òÃÖ¤­´¹¤¨¤º, ¥¨¥é¡¼¤È¤·¤Æ°·¤¦" -#: src/tar.c:474 -#, fuzzy +#: src/tar.c:488 msgid "don't replace existing files when extracting, silently skip over them" -msgstr "¼è¤ê½Ð¤¹ºÝ¤Ë´û¸¤Î¥Õ¥¡¥¤¥ë¤òÃÖ¤­´¹¤¨¤Ê¤¤" +msgstr "¼è¤ê½Ð¤¹ºÝ¤Ë´û¸¤Î¥Õ¥¡¥¤¥ë¤òÃÖ¤­´¹¤¨¤º, ¤½¤Î¤Þ¤Þ¥¹¥­¥Ã¥×¤¹¤ë" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "¥¢¡¼¥«¥¤¥Ö¥³¥Ô¡¼¤è¤ê¿·¤·¤¤´û¸¥Õ¥¡¥¤¥ë¤òÃÖ¤­´¹¤¨¤Ê¤¤" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "¼è¤ê½Ð¤¹ºÝ¤Ë´û¸¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤­" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "³Æ¡¹¤Î¥Õ¥¡¥¤¥ë¤ò¼è¤ê½Ð¤·¤Æ¾å½ñ¤­¤¹¤ëÁ°¤Ëºï½ü" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ò¼è¤ê½Ð¤¹Á°¤Ë³¬Áؤò¶õ¤Ë" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "´û¸¥Ç¥£¥ì¥¯¥È¥ê¤Î¥á¥¿¥Ç¡¼¥¿¤òÊݸ" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "¼è¤ê½Ð¤¹ºÝ¤Ë´û¸¥Ç¥£¥ì¥¯¥È¥ê¤Î¥á¥¿¥Ç¡¼¥¿¤ò¾å½ñ¤­ (ɸ½à)" -#: src/tar.c:490 -#, fuzzy +#: src/tar.c:504 msgid "preserve existing symlinks to directories when extracting" -msgstr "¼è¤ê½Ð¤¹ºÝ¤Ë´û¸¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤­" +msgstr "¼è¤ê½Ð¤¹ºÝ¤Ë¥Ç¥£¥ì¥¯¥È¥ê¤Ø¤Î´û¸¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ò°Ý»ý" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "DIR" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "½ÐÎÏ¥¹¥È¥ê¡¼¥à¤òÁªÂò" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "¥Õ¥¡¥¤¥ë¤ò¼è¤ê½Ð¤·¤Æɸ½à½ÐÎϤ˽ÐÎÏ" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "COMMAND" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "¥Õ¥¡¥¤¥ë¤ò¼è¤ê½Ð¤·¤ÆÊÌ¤Î¥×¥í¥°¥é¥à¤Ë½ÐÎÏ" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "»Ò¥×¥í¥»¥¹¤Î½ªÎ»¥³¡¼¥É¤ò̵»ë" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "»Ò¥×¥í¥»¥¹¤ÎÈó¥¼¥í½ªÎ»¥³¡¼¥É¤ò¥¨¥é¡¼¤È¤·¤Æ½èÍý" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "¥Õ¥¡¥¤¥ë°À­¤Î½èÍý" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "²Ã¤¨¤¿¥Õ¥¡¥¤¥ë¤Î½êÍ­¼Ô¤ò NAME ¤ËÊѹ¹" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "²Ã¤¨¤¿¥Õ¥¡¥¤¥ë¤Î¥°¥ë¡¼¥×¤ò NAME ¤ËÊѹ¹" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "DATE-OR-FILE" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "DATE-OR-FILE ¤«¤éÄɲåե¡¥¤¥ë¤Î mtime ¤òÀßÄê" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "CHANGES" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "²Ã¤¨¤¿¥Õ¥¡¥¤¥ë¤Î (¥·¥ó¥Ü¥ê¥Ã¥¯) ¥â¡¼¥É¤ò CHANGES ¤ËÊѹ¹" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "METHOD" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " @@ -1659,11 +1671,11 @@ msgstr "" "ºÇ½ª¥¢¥¯¥»¥¹»þ¹ï¤ò, Æɤ߹þ¤ß¸å¤ËÉü¸µ¤¹¤ë (METHOD='replace'; ɸ½à) ¤«ºÇ½é¤ËÀß" "Äꤷ¤Ê¤¤ (METHOD='system') ¤«¤Î¤É¤Á¤é¤«¤ÎÊýË¡¤Ç¥À¥ó¥×¥Õ¥¡¥¤¥ë¾å¤Ç°Ý»ý" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "¥Õ¥¡¥¤¥ë¤Î¹¹¿·»þ¹ï¤ò¼è¤ê½Ð¤µ¤Ê¤¤" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" @@ -1671,215 +1683,222 @@ msgstr "" "¥¢¡¼¥«¥¤¥ÖÆâ¤ÈƱ¤¸½êÍ­¼Ô¤Î¤Þ¤Þ¤Ç¥Õ¥¡¥¤¥ë¤ò¼è¤ê½Ð¤·¤Æ¤ß¤ë (¥¹¡¼¥Ñ¡¼¥æ¡¼¥¶¤Ç¤Ï" "¥Ç¥Õ¥©¥ë¥È)" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "¤¢¤Ê¤¿¼«¿È¤Î¥Õ¥¡¥¤¥ë¤È¤·¤Æ¼è¤ê½Ð¤¹ (°ìÈ̥桼¥¶¤Ç¤Ï¥Ç¥Õ¥©¥ë¥È)" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "¥æ¡¼¥¶Ì¾/¥°¥ë¡¼¥×̾¤È¤·¤Æ¾ï¤Ë¿ô»ú¤ò»È¤¦" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "¥Õ¥¡¥¤¥ë°À­¤Ë¤Ä¤¤¤Æ¤Î¾ðÊó¤òÃê½Ð (superuser ¤Ç¤Ïɸ½à)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" "¥¢¡¼¥«¥¤¥Ö¤«¤é°À­¤òÃê½Ð¤¹¤ëºÝ¤Ë¥æ¡¼¥¶¤Î umask ¤òŬÍÑ (°ìÈ̥桼¥¶¤Ç¤Ïɸ½à)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" -msgstr "" +msgstr "¥á¥ó¥Ð¡¼°ú¿ô¤Ï¥¢¡¼¥«¥¤¥ÖÆâ¤Î¥Õ¥¡¥¤¥ë¤ÈƱ¤¸½çÈÖ¤Çʤó¤Ç¤¤¤Þ¤¹" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "-p ¤È -s ¤ÎξÊý¤ò»ØÄꤷ¤¿¤â¤Î¤ÈƱ¤¸" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" "Ãê½Ð¤¬½ªÎ»¤¹¤ë¤Þ¤ÇÃê½Ð¤µ¤ì¤¿¥Ç¥£¥ì¥¯¥È¥ê¤ÎºÇ½ª¹¹¿·»þ¹ï¤È°À­¤ÎÀßÄê¤òÃ٤餻¤ë" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "--delay-directory-restore ¥ª¥×¥·¥ç¥ó¤Î¸ú²Ì¤ò¼è¤ê¾Ã¤·" -#: src/tar.c:554 -#, fuzzy +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 msgid "Handling of extended file attributes:" -msgstr "¥Õ¥¡¥¤¥ë°À­¤Î½èÍý" +msgstr "³ÈÄ¥¥Õ¥¡¥¤¥ë°À­¤Î½èÍý" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" -msgstr "" +msgstr "³Èĥ°À­Âбþ¤òÍ­¸ú¤Ë" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" -msgstr "" +msgstr "³Èĥ°À­Âбþ¤ò̵¸ú¤Ë" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" -msgstr "" +msgstr "MASK" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" -msgstr "" +msgstr "xattr ¥­¡¼¤ËÂФ¹¤ëÊñ´Þ¥Ñ¥¿¡¼¥ó¤ò»ØÄê" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" -msgstr "" +msgstr "xattr ¥­¡¼¤ËÂФ¹¤ë½ü³°¥Ñ¥¿¡¼¥ó¤ò»ØÄê" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" -msgstr "" +msgstr "SELinux ¥³¥ó¥Æ¥¯¥¹¥ÈÂбþ¤òÍ­¸ú¤Ë" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" -msgstr "" +msgstr "SELinux ¥³¥ó¥Æ¥¯¥¹¥ÈÂбþ¤ò̵¸ú¤Ë" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" -msgstr "" +msgstr "POSIX ACL Âбþ¤òÍ­¸ú¤Ë" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" -msgstr "" +msgstr "POSIX ACL Âбþ¤ò̵¸ú¤Ë" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "¥Ç¥Ð¥¤¥¹¤ÎÁªÂò¤ÈÀÚÂØ:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ARCHIVE" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï¥Ç¥Ð¥¤¥¹ ARCHIVE ¤ò»ÈÍÑ" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤Ï¥³¥í¥ó¤ò´Þ¤ó¤Ç¤¤¤Æ¤â¥í¡¼¥«¥ë" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "»ØÄꤵ¤ì¤¿ rmt COMMAND ¤ò rmt ¤ÎÂå¤ï¤ê¤Ë»ÈÍÑ" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "rsh ¤ÎÂå¤ï¤ê¤Ë COMMAND ¤ò»ÈÍÑ" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "¥É¥é¥¤¥Ö¤ÈÌ©ÅÙ¤ò»ØÄê" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "¥Þ¥ë¥Á¥Ü¥ê¥å¡¼¥à¤Î¥¢¡¼¥«¥¤¥Ö¤òºîÀ®/°ìÍ÷/Ãê½Ð" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "NUMBER x 1024 ¥Ð¥¤¥È¤ò½ñ¤­½Ð¤·¤¿¸å¤Ç¥Æ¡¼¥×¤òÊѹ¹" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "³Æ¡¹¤Î¥Æ¡¼¥×¤ÎºÇ¸å¤Ç¥¹¥¯¥ê¥×¥È¤ò¼Â¹Ô (-M ɬ¿Ü)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "FILE Ãæ¤Î¥Ü¥ê¥å¡¼¥àÈÖ¹æ¤ò»ÈÍÑ/¹¹¿·" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "¥Ç¥Ð¥¤¥¹¥Ö¥í¥Ã¥­¥ó¥°:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "BLOCKS" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "¥ì¥³¡¼¥É¤¢¤¿¤ê BLOCKS x 512 ¥Ð¥¤¥È" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "¥ì¥³¡¼¥É¤¢¤¿¤ê NUMBER ¥Ð¥¤¥È. 512 ¤ÎÇÜ¿ô" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "¥¢¡¼¥«¥¤¥ÖÃæ¤Î¥¼¥í¥Ö¥í¥Ã¥¯ (¤Ä¤Þ¤ê EOF) ¤ò̵»ë" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "Æɤ߽Ф·¤¿¤è¤¦¤ËºÆ¥Ö¥í¥Ã¥¯ (4.2BSD ¥Ñ¥¤¥×ÍÑ)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "¥¢¡¼¥«¥¤¥Ö·Á¼°¤ÎÁªÂò" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "FORMAT" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "»ØÄꤵ¤ì¤¿·Á¼°¤Î¥¢¡¼¥«¥¤¥Ö¤òºîÀ®" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "FORMAT ¤Ï¼¡¤Î¤¦¤Á¤Î 1¤Ä:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "¸Å¤¤ V7 tar ·Á¼°" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "GNU tar 1.12 °ÊÁ°¤Î·Á¼°" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x ·Á¼°" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) ·Á¼°" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) ·Á¼°" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "pax ¤ÈƱ¤¸" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "--format=v7 ¤ÈƱ¤¸" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "--format=posix ¤ÈƱ¤¸" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "keyword[[:]=value][,keyword[[:]=value]]..." -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "pax ¥­¡¼¥ï¡¼¥É¤òÀ©¸æ" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "TEXT" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1887,169 +1906,179 @@ msgstr "" "¥Ü¥ê¥å¡¼¥à̾ TEXT ¤Î¥¢¡¼¥«¥¤¥Ö¤òºîÀ®. °ìÍ÷/Ãê½Ð»þ¤Ë TEXT ¤ò¥Ü¥ê¥å¡¼¥à̾¤ËÂФ¹" "¤ëÃê½Ð¥Ñ¥¿¡¼¥ó¤Ë»ÈÍÑ" -#: src/tar.c:660 +#: src/tar.c:684 msgid "Compression options:" msgstr "°µ½Ì¥ª¥×¥·¥ç¥ó:" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "°µ½Ì¥×¥í¥°¥é¥à¤ò·è¤á¤ë¤Î¤Ë¥¢¡¼¥«¥¤¥ÖÀÜÈø¼­¤ò»ÈÍѤ¹¤ë" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "°µ½Ì¥×¥í¥°¥é¥à¤ò·è¤á¤ë¤Î¤Ë¥¢¡¼¥«¥¤¥ÖÀÜÈø¼­¤ò»ÈÍѤ·¤Ê¤¤" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "PROG" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "PROG ·Ðͳ¤Ç¥Õ¥£¥ë¥¿ (-d ¤ò¼õ¤±ÉÕ¤±¤ëɬÍפ¢¤ê)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ëÁªÂò:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" "»ØÄꤵ¤ì¤¿ FILE ¤ò¥¢¡¼¥«¥¤¥Ö¤ËÄɲà (¥À¥Ã¥·¥å ' ¤Ç»Ï¤Þ¤ë¥Õ¥¡¥¤¥ë̾¤Î¾ì¹ç¤ËÊØ" "Íø)" -#: src/tar.c:687 -msgid "DIR" -msgstr "DIR" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "¥Ç¥£¥ì¥¯¥È¥ê DIR ¤Ø°ÜÆ°" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "Ãê½Ð¤Þ¤¿¤ÏºîÀ®¤¹¤ë̾Á°¤ò¥Õ¥¡¥¤¥ë FILE ¤«¤é¼èÆÀ" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "-T ¤¬ null ¤Ç½ª¤ï¤ë̾Á°¤òÆɤ߹þ¤ß, -C ¤ò̵¸ú²½" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "Á°¤Î --null ¥ª¥×¥·¥ç¥ó¤Î¸ú²Ì¤ò̵¸ú²½" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" msgstr "-T ¤ÇÆɤ߹þ¤ó¤À¥Õ¥¡¥¤¥ë̾¤ò°úÍѽªÎ»¤¹¤ë (ɸ½à)" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" msgstr "-T ¤ÇÆɤ߹þ¤ó¤¿¥Õ¥¡¥¤¥ë̾¤ò°úÍѽªÎ»¤·¤Ê¤¤" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "PATTERN" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "PATTERN ¤Ë°ìÃפ¹¤ë¥Õ¥¡¥¤¥ë¤ò½ü³°" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "FILE ¤ËÎóµó¤µ¤ì¤¿¥Ñ¥¿¡¼¥ó¤ò½ü³°" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "¥¿¥°¥Õ¥¡¥¤¥ë¼«¿È¤ò½ü¤¯ CACHEDIR.TAG ¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê¤ÎÆâÍƤò½ü³°" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "CACHEDIR.TAG ¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤ÎÁ´¤Æ¤ò½ü³°" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "CACHEDIR.TAG ¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê¤ò½ü³°" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "FILE ¼«¿È¤ò½ü¤¯ FILE ¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê¤ÎÆâÍƤò½ü³°" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "FILE ¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê°Ê²¼¤ÎÁ´¤Æ¤ò½ü³°" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "FILE ¤ò´Þ¤à¥Ç¥£¥ì¥¯¥È¥ê¤ò½ü³°" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "¥Ð¡¼¥¸¥ç¥ó´ÉÍý¥·¥¹¥Æ¥à¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ò½ü³°" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "¥Ð¥Ã¥¯¥¢¥Ã¥×¤ò½ü³°¤·¤Æ¥Õ¥¡¥¤¥ë¤ò¥í¥Ã¥¯" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ò¼«Æ°Åª¤Ë²¼¤Ã¤Æ¤¤¤«¤Ê¤¤" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "¥¢¡¼¥«¥¤¥ÖºîÀ®»þ¤Ë¥í¡¼¥«¥ë¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ë¸ÂÄê" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ò½ç·«¤ê¤Ë²¼¤Ã¤Æ¤¤¤¯ (default)" -#: src/tar.c:729 -#, fuzzy +#: src/tar.c:761 msgid "don't strip leading '/'s from file names" -msgstr "¥Õ¥¡¥¤¥ë̾¤«¤éÀèƬ¤Î `/' ¤ò¼è¤ê½ü¤«¤Ê¤¤" +msgstr "¥Õ¥¡¥¤¥ë̾¤«¤éÀèƬ¤Î '/' ¤ò¼è¤ê½ü¤«¤Ê¤¤" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ò¤¿¤É¤ë; ¤½¤ì¤é¤¬»Ø¤¹¥Õ¥¡¥¤¥ë¤ò¥¢¡¼¥«¥¤¥Ö¤·¤Æ¥À¥ó¥×" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "¥Ï¡¼¥É¥ê¥ó¥¯¤ò¤¿¤É¤ë; ¤½¤ì¤é¤¬»Ø¤¹¥Õ¥¡¥¤¥ë¤ò¥¢¡¼¥«¥¤¥Ö¤·¤Æ¥À¥ó¥×" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "MEMBER-NAME" -#: src/tar.c:735 -#, fuzzy +#: src/tar.c:767 msgid "begin at member MEMBER-NAME when reading the archive" -msgstr "¥¢¡¼¥«¥¤¥ÖÃæ¤Î¥á¥ó¥Ð¡¼ MEMBER-NAME ¤Ç³«»Ï" +msgstr "¥¢¡¼¥«¥¤¥Ö¤ÎÆɤ߼è¤ê»þ¤Ë¥á¥ó¥Ð¡¼ MEMBER-NAME ¤Ç³«»Ï" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "DATE-OR-FILE ¤è¤ë¿·¤·¤¤¥Õ¥¡¥¤¥ë¤Î¤ß¤ò³ÊǼ" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "DATE" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "¥Ç¡¼¥¿¤¬Êѹ¹¤µ¤ì¤¿»þ¤À¤±ÆüÉÕ¤ª¤è¤Ó»þ¹ï¤òÈæ³Ó" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "CONTROL" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "ºï½üÁ°¤Ë¥Ð¡¼¥¸¥ç¥ó´ÉÍý¤ò CONTROL ¤Ë¤·¤Æ¥Ð¥Ã¥¯¥¢¥Ã¥×" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "STRING" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -2057,98 +2086,95 @@ msgstr "" "ºï½üÁ°¤Ë¥Ð¥Ã¥¯¥¢¥Ã¥×, Ä̾ï¤ÎÀÜÈø¼­ (´Ä¶­ÊÑ¿ô SIMPLE_BACKUP_SUFFIX ¤¬Ì¤ÀßÄê¤Ê" "¤é '~') ¤ò¾å½ñ¤­" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "¥Õ¥¡¥¤¥ë̾ÊÑ´¹:" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "Ãê½Ð»þ¤Ë¥Õ¥¡¥¤¥ë̾¤«¤éÀèƬ¤Î NUMBER ¸Ä¤Î¥³¥ó¥Ý¥Í¥ó¥È¤ò½üµî" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "EXPRESSION" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "¥Õ¥¡¥¤¥ë̾¤ÎÊÑ´¹¤Ë sed ¤ÎÃÖ´¹ EXPRESSION ¤ò»ÈÍÑ" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "¥Õ¥¡¥¤¥ë̾°ìÃ×¥ª¥×¥·¥ç¥ó (½ü³°/Êñ´Þ¤Îξ¥Ñ¥¿¡¼¥ó¤ËºîÍÑ):" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "Âçʸ»ú¾®Ê¸»ú¤ò̵»ë" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "¥Õ¥¡¥¤¥ë̾¤ÎÀèƬ¤È¥Ñ¥¿¡¼¥ó¤¬°ìÃ×" -#: src/tar.c:767 -#, fuzzy +#: src/tar.c:799 msgid "patterns match after any '/' (default for exclusion)" -msgstr "Ǥ°Õ¤Î `/' °Ê¹ß¤Ë¥Ñ¥¿¡¼¥ó¤¬°ìÃ× (ɸ½à¤Ç½ü³°)" +msgstr "Ǥ°Õ¤Î '/' °Ê¹ß¤Ë¥Ñ¥¿¡¼¥ó¤¬°ìÃ× (ɸ½à¤Ç½ü³°)" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "Âçʸ»ú¾®Ê¸»ú¤ò¹Íθ¤·¤Æ°ìÃ× (ɸ½à)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "¥ï¥¤¥ë¥É¥«¡¼¥É¤ò»ÈÍÑ (ɸ½à¤Ç½ü³°)" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "Ãà¸ìŪʸ»úÎó°ìÃ×" -#: src/tar.c:775 -#, fuzzy +#: src/tar.c:807 msgid "wildcards do not match '/'" -msgstr "¥ï¥¤¥ë¥É¥«¡¼¥É¤¬ `/' ¤Ë°ìÃפ·¤Ê¤¤" +msgstr "¥ï¥¤¥ë¥É¥«¡¼¥É¤¬ '/' ¤Ë°ìÃפ·¤Ê¤¤" -#: src/tar.c:777 -#, fuzzy +#: src/tar.c:809 msgid "wildcards match '/' (default for exclusion)" -msgstr "¥ï¥¤¥ë¥É¥«¡¼¥É¤¬ `/' ¤Ë°ìÃ× (ɸ½à¤Ç½ü³°)" +msgstr "¥ï¥¤¥ë¥É¥«¡¼¥É¤¬ '/' ¤Ë°ìÃ× (ɸ½à¤Ç½ü³°)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "¾ðÊó:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "½èÍý¤µ¤ì¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤Î°ìÍ÷¤ò¾éŤËɽ¼¨" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "KEYWORD" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "·Ù²ü´ÉÀ©" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "NUMBER (ɸ½à 10) ÈÖÌܤε­Ï¿¤´¤È¤Ë¿ÊĽ¥á¥Ã¥»¡¼¥¸¤òɽ¼¨" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "ACTION" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "³Æ¸¡Ìä¤Ç ACTION ¤ò¼Â¹Ô" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "Á´¤Æ¤Î¥ê¥ó¥¯¤¬¥À¥ó¥×¤µ¤ì¤Ê¤¤¾ì¹ç¥á¥Ã¥»¡¼¥¸¤òɽ¼¨" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "SIGNAL" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2159,121 +2185,120 @@ msgstr "" "»þ¤ËÁí¥Ð¥¤¥È¿ô¤òɽ¼¨. µö²Ä¤µ¤ì¤¿ SIGNAL ¤Ï: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 " "¤ª¤è¤Ó SIGUSR2. SIG ÀÜƬ¼­¤¬¤Ê¤¤Ì¾Á°¤Ç¤â²Ä" -#: src/tar.c:802 +#: src/tar.c:834 msgid "print file modification times in UTC" msgstr "¥Õ¥¡¥¤¥ë¤Î¹¹¿·»þ¹ï¤ò UTC ¤Çɽ¼¨" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "¥Õ¥¡¥¤¥ë¤Î»þ¹ï¾ðÊó¤ò´°Á´·Á¼°¤Çɽ¼¨" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "¾éĹ½ÐÎϤò FILE ¤ËÁ÷¿®" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "¥¢¡¼¥«¥¤¥ÖÆâ¤Î¥Ö¥í¥Ã¥¯¿ô¤ò³Æ¡¹¥á¥Ã¥»¡¼¥¸ÉÕ¤­¤Çɽ¼¨" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "Á´¤Æ¤ÎÆ°ºî¤ò³Îǧ" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "tar ¤Î´ûÄêÃͤòɽ¼¨" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" -msgstr "" +msgstr "¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¥Õ¥¡¥¤¥ë¤ÎÎΰè¤ÎÀµÅö¤ÊÈϰϤòɽ¼¨" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "°ìÍ÷¤äÃê½Ð»þ¤Ë, ¸¡º÷´ð½à¤Ë°ìÃפ·¤Ê¤¤¥Ç¥£¥ì¥¯¥È¥ê¤ò³Æ¡¹°ìÍ÷ɽ¼¨" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "ÊÑ´¹¸å¤Ë¥Õ¥¡¥¤¥ë̾¤Þ¤¿¤Ï¥¢¡¼¥«¥¤¥Ö̾¤òɽ¼¨" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "STYLE" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "̾Á°°úÍÑ·Á¼°¤òÀßÄê. Í­¸ú¤Ê STYLE Ãͤϲ¼µ­»²¾È." -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "¹¹¤Ë STRING ¤«¤éʸ»ú¤ò°úÍÑ" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "STRING ¤«¤é¤Îʸ»ú°úÍѤò̵¸ú¤Ë" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "¸ß´¹¥ª¥×¥·¥ç¥ó:" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "ºîÀ®»þ¤Ï --old-archive ¤ÈƱ¤¸. Ãê½Ð»þ¤Ï --no-same-owner ¤ÈƱ¤¸" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "¤½¤Î¾¥ª¥×¥·¥ç¥ó:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "ÀøºßŪ¤Ë³²¤Ë¤Ê¤ë¥ª¥×¥·¥ç¥ó¤Î»ÈÍѤò̵¸ú¤Ë" -#: src/tar.c:978 -#, fuzzy +#: src/tar.c:1010 msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" msgstr "" -"`-Acdtrux' ¤Þ¤¿¤Ï `--test-label' ¥ª¥×¥·¥ç¥ó¤Î¤¦¤Á 2¤Ä°Ê¾å»ØÄꤹ¤ë¤³¤È¤Ï¤Ç¤­¤Þ" -"¤»¤ó" +"'-Acdtrux', '--delete' ¤Þ¤¿¤Ï '--test-label' ¥ª¥×¥·¥ç¥ó¤Î¤¦¤Á 2¤Ä°Ê¾å»ØÄꤹ¤ë" +"¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "°µ½Ì¥ª¥×¥·¥ç¥ó¤¬¿©¤¤°ã¤Ã¤Æ¤¤¤Þ¤¹" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "̤ÃΤΥ·¥°¥Ê¥ë̾: %s" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "ÆüÉÕ¥µ¥ó¥×¥ë¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "̤ÃΤÎÆüÉÕ¥Õ¥©¡¼¥Þ¥Ã¥È¤Î %2$s Âå¤ï¤ê¤Ë %1$s ¤È¤·¤Þ¤¹" -#: src/tar.c:1108 -#, fuzzy, c-format +#: src/tar.c:1140 +#, c-format msgid "Option %s: Treating date '%s' as %s" -msgstr "¥ª¥×¥·¥ç¥ó %s: `%s' ¤ò %s ¤È¤·¤Æ°·¤¦" +msgstr "¥ª¥×¥·¥ç¥ó %s: ÆüÉÕ '%s' ¤ò %s ¤È¤·¤Æ°·¤¦" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "%s ·Ðͳ¤Ç¥¢¡¼¥«¥¤¥Ö¤ò¥Õ¥£¥ë¥¿" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "--quoting-style ¥ª¥×¥·¥ç¥ó¤ËÂФ¹¤ëÍ­¸ú¤Ê°ú¿ô:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2281,48 +2306,47 @@ msgstr "" "\n" "¡Ö¤³¤Î¡×tar ¤Îµ¬ÄêÃÍ:\n" -#: src/tar.c:1295 -#, fuzzy +#: src/tar.c:1330 msgid "Invalid owner or group ID" -msgstr "̵¸ú¤Ê½êÍ­¼Ô" +msgstr "̵¸ú¤Ê½êÍ­¼Ô¤Þ¤¿¤Ï¥°¥ë¡¼¥×ID" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "̵¸ú¤Ê¥Ö¥í¥Ã¥­¥ó¥°°ø»Ò" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "̵¸ú¤Ê¥Æ¡¼¥×¤ÎŤµ" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "̵¸ú¤ÊÁýʬ¥ì¥Ù¥ëÃÍ" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "1¤Ä°Ê¾å¤ÎÉßµï¤È¤Ê¤ëÆüÉÕ" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "̵¸ú¤Ê¤Þ¤Ð¤é (sparse) ¥Ð¡¼¥¸¥ç¥óÃÍ" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' ¤Ï¤³¤Î¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤Ï¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "--checkpoint ÃͤÏÀ°¿ô¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "¥ª¥×¥·¥ç¥ó¤Ç»ØÄꤵ¤ì¤¿¥â¡¼¥É¤Ï̵¸ú¤Ç¤¹" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "̵¸ú¤Ê¿ô" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" @@ -2330,151 +2354,139 @@ msgstr "" "--preserve ¥ª¥×¥·¥ç¥ó¤ÏÇÑ»ßͽÄê¤Ê¤Î¤Ç, Âå¤ï¤ê¤Ë --preserve-permissions --" "preserve-order ¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "̵¸ú¤Êµ­Ï¿¥µ¥¤¥º" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "µ­Ï¿¥µ¥¤¥º¤Ï %d ¤ÎÇÜ¿ô¤Ç¤Ê¤±¤ì¤Ð¤¤¤±¤Þ¤»¤ó" -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "̵¸ú¤Ê¥¨¥ì¥á¥ó¥È¿ô" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "--to-command ¥ª¥×¥·¥ç¥ó¤Ï 1¤Ä¤À¤±µö²Ä" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "ÉÔÀµ·Á¼°¤ÎÌ©ÅÙ°ú¿ô: %s" -#: src/tar.c:2133 -#, fuzzy, c-format +#: src/tar.c:2205 +#, c-format msgid "Unknown density: '%c'" -msgstr "̤ÃΤÎÌ©ÅÙ: `%c'" +msgstr "̤ÃΤÎÌ©ÅÙ: '%c'" -#: src/tar.c:2150 -#, fuzzy, c-format +#: src/tar.c:2222 +#, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" -msgstr "¥ª¥×¥·¥ç¥ó `-[0-7][lmh]' ¤Ï¡Ö¤³¤Î¡×tar ¤Ç¤Ï¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" +msgstr "¥ª¥×¥·¥ç¥ó '-[0-7][lmh]' ¤Ï¡Ö¤³¤Î¡×tar ¤Ç¤Ï¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[¥Õ¥¡¥¤¥ë]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 #, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "--%s ¤Ï %s ¤È°ì½ï¤Ë»È¤¨¤Þ¤»¤ó" + +#: src/tar.c:2389 +#, c-format msgid "Old option '%c' requires an argument." -msgstr "¸Å¤¤¥ª¥×¥·¥ç¥ó `%c' ¤Ï°ú¿ô¤òɬÍפȤ·¤Þ¤¹" +msgstr "¸Å¤¤¥ª¥×¥·¥ç¥ó '%c' ¤Ï°ú¿ô¤òɬÍפȤ·¤Þ¤¹" -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence ¤Ï¥Õ¥¡¥¤¥ë°ìÍ÷¤¬¤Ê¤±¤ì¤Ð̵°ÕÌ£" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "--occurrence ¤ÏÍ׵ᤵ¤ì¤¿Áàºî¥â¡¼¥É¤Ç¤Ï»È¤¨¤Þ¤»¤ó" - -#: src/tar.c:2408 -#, fuzzy +#: src/tar.c:2490 msgid "Multiple archive files require '-M' option" -msgstr "ʬ³ä·¿¤Î¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤Ë¤Ï `-M' ¥ª¥×¥·¥ç¥ó¤¬É¬ÍפǤ¹" +msgstr "Ê£¹ç·¿¥¢¡¼¥«¥¤¥Ö¥Õ¥¡¥¤¥ë¤Ë¤Ï '-M' ¥ª¥×¥·¥ç¥ó¤¬É¬ÍפǤ¹" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "--listed-incremental ¤È --newer ¤È¤ò·ë¹ç¤Ç¤­¤Þ¤»¤ó" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "--listed-incremental ¤Ê¤·¤Î --level ¤Ï̵°ÕÌ£¤Ç¤¹" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "%s: ¥Ü¥ê¥å¡¼¥à¥é¥Ù¥ë¤¬Ä¹¤¹¤®¤Þ¤¹ (%lu ¥Ð¥¤¥ÈÀ©¸Â)" msgstr[1] "%s: ¥Ü¥ê¥å¡¼¥à¥é¥Ù¥ë¤¬Ä¹¤¹¤®¤Þ¤¹ (%lu ¥Ð¥¤¥ÈÀ©¸Â)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "¥Þ¥ë¥Á¥Ü¥ê¥å¡¼¥à¥¢¡¼¥«¥¤¥Ö¤ò³Îǧ¤Ç¤­¤Þ¤»¤ó" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "°µ½Ì¤µ¤ì¤¿¥¢¡¼¥«¥¤¥Ö¤Ï³Îǧ¤Ç¤­¤Þ¤»¤ó" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "¥Ñ¥¿¡¼¥ó %s ¤Ï»È¤¨¤Þ¤»¤ó" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "¥Þ¥ë¥Á¥Ü¥ê¥å¡¼¥à¤Ë°µ½Ì¤µ¤ì¤¿¥¢¡¼¥«¥¤¥Ö¤Ï»È¤¨¤Þ¤»¤ó" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "°µ½Ì¤µ¤ì¤¿¥¢¡¼¥«¥¤¥Ö¤ÏÏ¢·ë¤Ç¤­¤Þ¤»¤ó" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option ¤Ï POSIX ¥¢¡¼¥«¥¤¥Ö¤Ç¤Î¤ß»È¤¨¤Þ¤¹" -#: src/tar.c:2478 -#, fuzzy +#: src/tar.c:2560 msgid "--acls can be used only on POSIX archives" -msgstr "--pax-option ¤Ï POSIX ¥¢¡¼¥«¥¤¥Ö¤Ç¤Î¤ß»È¤¨¤Þ¤¹" +msgstr "--acls ¤Ï POSIX ¥¢¡¼¥«¥¤¥Ö¤Ç¤Î¤ß»È¤¨¤Þ¤¹" -#: src/tar.c:2483 -#, fuzzy +#: src/tar.c:2565 msgid "--selinux can be used only on POSIX archives" -msgstr "--pax-option ¤Ï POSIX ¥¢¡¼¥«¥¤¥Ö¤Ç¤Î¤ß»È¤¨¤Þ¤¹" +msgstr "--selinux ¤Ï POSIX ¥¢¡¼¥«¥¤¥Ö¤Ç¤Î¤ß»È¤¨¤Þ¤¹" -#: src/tar.c:2488 -#, fuzzy +#: src/tar.c:2570 msgid "--xattrs can be used only on POSIX archives" -msgstr "--pax-option ¤Ï POSIX ¥¢¡¼¥«¥¤¥Ö¤Ç¤Î¤ß»È¤¨¤Þ¤¹" +msgstr "--xattrs ¤Ï POSIX ¥¢¡¼¥«¥¤¥Ö¤Ç¤Î¤ß»È¤¨¤Þ¤¹" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "¥Ñ¥¿¡¼¥ó %s ¤Ï»È¤¨¤Þ¤»¤ó" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" +msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "¥Ü¥ê¥å¡¼¥àĹ¤Ï¥ì¥³¡¼¥É¥µ¥¤¥º¤è¤ê¾®¤µ¤¯¤Æ¤Ï¤¤¤±¤Þ¤»¤ó" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "--preserve-order ¤Ï --listed-incremental ¤ÈξΩ¤·¤Þ¤»¤ó" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "¶õ¤Î¥¢¡¼¥«¥¤¥ÖºîÀ®¤Ï¤´ÍƼϴꤤ¤Þ¤¹" -#: src/tar.c:2565 -#, fuzzy +#: src/tar.c:2669 msgid "Options '-Aru' are incompatible with '-f -'" -msgstr "¥ª¥×¥·¥ç¥ó `-Aru' ¤È `-f -' ¤È¤ÏÁêÍƤì¤Þ¤»¤ó" +msgstr "¥ª¥×¥·¥ç¥ó '-Aru' ¤È '-f -' ¤È¤ÏÁêÍƤì¤Þ¤»¤ó" -#: src/tar.c:2660 -#, fuzzy +#: src/tar.c:2766 msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" msgstr "" -"`-Acdtrux' ¤Þ¤¿¤Ï `--test-label' ¥ª¥×¥·¥ç¥ó¤Î¤¦¤Á¡¢¤¤¤º¤ì¤« 1¤Ä¤ò»ØÄꤷ¤Ê¤±¤ì" -"¤Ð¤Ê¤ê¤Þ¤»¤ó" +"'-Acdtrux', '--delete' ¤Þ¤¿¤Ï '--test-label' ¥ª¥×¥·¥ç¥ó¤Î¤¦¤Á¡¢¤¤¤º¤ì¤« 1¤Ä¤ò" +"»ØÄꤷ¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "Á°¤Î¥¨¥é¡¼¤Ë¤è¤ê¼ºÇÔ¥¹¥Æ¡¼¥¿¥¹¤Ç½ªÎ»¤·¤Þ¤¹" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" @@ -2482,98 +2494,98 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: ¥Õ¥¡¥¤¥ë¤¬ %s ¥Ð¥¤¥È¾®¤µ¤¯¤Ê¤Ã¤Æ¤¤¤Þ¤¹" msgstr[1] "%s: ¥Õ¥¡¥¤¥ë¤¬ %s ¥Ð¥¤¥È¾®¤µ¤¯¤Ê¤Ã¤Æ¤¤¤Þ¤¹" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "¥­¡¼¥ï¡¼¥É %s ¤Ï̤ÃΤޤ¿¤Ï̤¼ÂÁõ" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" msgstr "¥¿¥¤¥à¥¹¥¿¥ó¥×¤¬µö²Ä¤µ¤ì¤¿Èϰϳ°¤Ç¤¹" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "¥Ñ¥¿¡¼¥ó %s ¤Ï»È¤¨¤Þ¤»¤ó" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "¥­¡¼¥ï¡¼¥É %s ¤Ïʤ¤»¤Þ¤»¤ó" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "ÉÔÀµ·Á¼°¤Î³ÈÄ¥¥Ø¥Ã¥À: Ťµ¤Î»ØÄ꤬¤¢¤ê¤Þ¤»¤ó" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "³ÈÄ¥¥Ø¥Ã¥ÀĹ %*s ¤ÏÈϰϳ°¤Ç¤¹" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "ÉÔÀµ·Á¼°¤Î³ÈÄ¥¥Ø¥Ã¥À: Ťµ¤Î¸å¤Ë¥Ö¥é¥ó¥¯¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "ÉÔÀµ·Á¼°¤Î³ÈÄ¥¥Ø¥Ã¥À: = (¥¤¥³¡¼¥ë) µ­¹æ¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "ÉÔÀµ·Á¼°¤Î³ÈÄ¥¥Ø¥Ã¥À: ²þ¹Ô¤¬¤¢¤ê¤Þ¤»¤ó" -#: src/xheader.c:740 -#, fuzzy, c-format +#: src/xheader.c:741 +#, c-format msgid "Ignoring unknown extended header keyword '%s'" -msgstr "̤ÃΤγÈÄ¥¥Ø¥Ã¥À¥­¡¼¥ï¡¼¥É `%s' ¤ò̵»ë" +msgstr "̤ÃΤγÈÄ¥¥Ø¥Ã¥À¥­¡¼¥ï¡¼¥É '%s' ¤ò̵»ë" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "À¸À®¤µ¤ì¤¿¥­¡¼¥ï¡¼¥É¤ÈÃͤΥڥ¢¤¬Ä¹²á¤®¤Þ¤¹ (¥­¡¼¥ï¡¼¥É=%s, Ťµ=%s)" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "³ÈÄ¥¥Ø¥Ã¥À %s=%s ¤Ï %s..%s ¤ÎÈÏ°ÏÆâ¤Ë¤¢¤ê¤Þ¤»¤ó" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "ÉÔÀµ·Á¼°¤Î³ÈÄ¥¥Ø¥Ã¥À: %s=%s ¤ÏÉÔÀµ" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "ÉÔÀµ·Á¼°¤Î³ÈÄ¥¥Ø¥Ã¥À: %s=%s ¤Ï;ʬ" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "ÉÔÀµ·Á¼°¤Î³ÈÄ¥¥Ø¥Ã¥À: %s ¤Ï̵¸ú: ͽ´ü¤»¤Ì¶èÀÚ¤êʸ»ú %c" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "ÉÔÀµ·Á¼°¤Î³ÈÄ¥¥Ø¥Ã¥À: %s ¤Ï̵¸ú: ´ñ¿ôÃÍ" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "%s: ̵¸ú¤Ê¥¿¥¤¥à¥¢¥¦¥È" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "%s: ̤ÃΤθ¡Ìä½èÍý" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "½ñ¤­¹þ¤ß" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "Æɤ߽Ф·" @@ -2581,7 +2593,7 @@ msgstr " #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "¥Á¥§¥Ã¥¯¥Ý¥¤¥ó¥È %u ¤ò½ñ¤­½Ð¤·¤Þ¤¹" @@ -2590,7 +2602,7 @@ msgstr " #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "¥Á¥§¥Ã¥¯¥Ý¥¤¥ó¥È %u ¤òÆɤ߹þ¤ß¤Þ¤¹" @@ -2798,14 +2810,14 @@ msgid "cannot set time on `%s'" msgstr "`%s' ¤Ë»þ¹ï¤òÀßÄê¤Ç¤­¤Þ¤»¤ó" #: tests/genfile.c:692 -#, fuzzy, c-format +#, c-format msgid "cannot truncate `%s'" -msgstr "`%s' ¤ò unlink ¤Ç¤­¤Þ¤»¤ó" +msgstr "`%s' ¤ò truncate ¤Ç¤­¤Þ¤»¤ó" #: tests/genfile.c:701 -#, fuzzy, c-format +#, c-format msgid "command failed: %s" -msgstr "%s ¥³¥Þ¥ó¥É¤¬¼ºÇÔ¤·¤Þ¤·¤¿" +msgstr "¥³¥Þ¥ó¥É¼ºÇÔ: %s" #: tests/genfile.c:706 #, c-format @@ -2847,23 +2859,14 @@ msgstr " msgid "--stat requires file names" msgstr "--stat ¤Ë¤Ï¥Õ¥¡¥¤¥ë̾¤¬É¬Í×" -#~ msgid "Cannot get working directory" -#~ msgstr "¥ï¡¼¥¯¥Ç¥£¥ì¥¯¥È¥ê¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó" - -#~ msgid "sort names to extract to match archive" -#~ msgstr "¥¢¡¼¥«¥¤¥Ö¤È¥Þ¥Ã¥Á¤µ¤»¤ë¤¿¤á¤Ë¼è¤ê½Ð¤¹Ì¾Á°¤òʤÓÂؤ¨" - -#~ msgid "Field too long while reading snapshot file" -#~ msgstr "¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ßÃæ¤Ë¥Õ¥£¡¼¥ë¥É¤¬Ä¹²á¤®¤Þ¤¹" - -#~ msgid "Read error in snapshot file" -#~ msgstr "¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¥Õ¥¡¥¤¥ë¤ËÆɤ߹þ¤ß¥¨¥é¡¼" +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "--occurrence ¤Ï %s ¤È°ì½ï¤Ë»È¤¨¤Þ¤»¤ó" -#~ msgid "Unexpected field value in snapshot file" -#~ msgstr "¥¹¥Ê¥Ã¥×¥·¥ç¥Ã¥È¥Õ¥¡¥¤¥ë¤Ëͽ´ü¤»¤Ì¥Õ¥£¡¼¥ë¥ÉÃÍ" +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "--listed-incremental ¤È --newer ¤È¤ò·ë¹ç¤Ç¤­¤Þ¤»¤ó" -#~ msgid "Extended header length is out of allowed range" -#~ msgstr "³ÈÄ¥¥Ø¥Ã¥ÀĹ¤Ïµö²Ä¤µ¤ì¤¿Èϰϳ°¤Ç¤¹" +#~ msgid "--verify cannot be used with %s" +#~ msgstr "--verify ¤Ï %s ¤È°ì½ï¤Ë»È¤¨¤Þ¤»¤ó" -#~ msgid "Invalid group" -#~ msgstr "̵¸ú¤Ê¥°¥ë¡¼¥×" +#~ msgid "--preserve-order is not compatible with --listed-incremental" +#~ msgstr "--preserve-order ¤Ï --listed-incremental ¤ÈξΩ¤·¤Þ¤»¤ó" diff --git a/po/ko.gmo b/po/ko.gmo index afe295e..552f400 100644 Binary files a/po/ko.gmo and b/po/ko.gmo differ diff --git a/po/ko.po b/po/ko.po index b73fe1d..39e650a 100644 --- a/po/ko.po +++ b/po/ko.po @@ -2,12 +2,12 @@ # Copyright (C) 1996 Free Software Foundation, Inc. # Bang Jun-Young , 1996-1997. # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" "Project-Id-Version: GNU tar 1.12\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" "PO-Revision-Date: 1997-05-30 22:55+0900\n" "Last-Translator: Bang Jun-Young \n" "Language-Team: Korean \n" @@ -100,7 +100,7 @@ msgstr "" msgid "give a short usage message" msgstr "" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "" @@ -139,9 +139,9 @@ msgid "write error" msgstr "" #: gnu/getopt.c:549 gnu/getopt.c:578 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "¿À·¡µÈ ¿É¼Ç `%c'´Â Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù." +msgstr "" #: gnu/getopt.c:626 gnu/getopt.c:630 #, fuzzy, c-format @@ -169,9 +169,9 @@ msgid "%s: unrecognized option '%c%s'\n" msgstr "" #: gnu/getopt.c:807 gnu/getopt.c:810 -#, fuzzy, c-format +#, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "record_size·Î ºÎÀûÀýÇÑ °ª" +msgstr "" #: gnu/getopt.c:863 gnu/getopt.c:880 gnu/getopt.c:1090 gnu/getopt.c:1108 #, fuzzy, c-format @@ -179,9 +179,9 @@ msgid "%s: option requires an argument -- '%c'\n" msgstr "¿À·¡µÈ ¿É¼Ç `%c'´Â Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù." #: gnu/getopt.c:936 gnu/getopt.c:952 -#, fuzzy, c-format +#, c-format msgid "%s: option '-W %s' is ambiguous\n" -msgstr "¿À·¡µÈ ¿É¼Ç `%c'´Â Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù." +msgstr "" #: gnu/getopt.c:976 gnu/getopt.c:994 #, fuzzy, c-format @@ -381,20 +381,16 @@ msgstr "" #. "Report translation bugs to <...>\n" with the address for translation #. bugs (typically your translation team's web or email address). #: gnu/version-etc.c:247 -#, fuzzy, c-format +#, c-format msgid "" "\n" "Report bugs to: %s\n" msgstr "" -"\n" -"·Î ¹ö±×¸¦ º¸°íÇØ ÁֽʽÿÀ.\n" #: gnu/version-etc.c:249 -#, fuzzy, c-format +#, c-format msgid "Report %s bugs to: %s\n" msgstr "" -"\n" -"·Î ¹ö±×¸¦ º¸°íÇØ ÁֽʽÿÀ.\n" #: gnu/version-etc.c:253 #, c-format @@ -415,38 +411,38 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, fuzzy, c-format msgid "%s: Cannot %s" -msgstr "%s¸¦ ½ÇÇàÇÒ ¼ö ¾ø½À´Ï´Ù" +msgstr "%s¸¦ statÇÒ ¼ö ¾ø½À´Ï´Ù" #. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'. #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, fuzzy, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: ¸ðµå¸¦ %0.4o·Î ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, fuzzy, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: ¼ÒÀ¯ÀÚ¸¦ uid %d, gid %d·Î ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù" # -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, fuzzy, c-format msgid "%s: Cannot hard link to %s" msgstr "¸µÅ© %s¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù" # -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, fuzzy, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" @@ -454,7 +450,7 @@ msgstr[0] "%ld msgstr[1] "%ld ¹ÙÀÌƮ°¿¡¼­ Àб⠿À·ù, %d ¹ÙÀÌÆ® ÀÐÀ½, ÆÄÀÏ %s" # -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, fuzzy, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" @@ -462,22 +458,22 @@ msgstr[0] "%ld msgstr[1] "%ld ¹ÙÀÌƮ°¿¡¼­ Àб⠿À·ù, %d ¹ÙÀÌÆ® ÀÐÀ½, ÆÄÀÏ %s" # -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, fuzzy, c-format msgid "%s: Cannot seek to %s" msgstr "%s¿¡ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, fuzzy, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: `%s'¿¡ ´ëÇÑ ±âÈ£¸µÅ©¸¦ ¸¸µé ¼ö ¾ø½À´Ï´Ù" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, fuzzy, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -547,9 +543,8 @@ msgid "Invalid seek direction" msgstr "¿É¼Ç¿¡ ºÎÀûÀýÇÑ ¸ðµå°¡ ÁÖ¾îÁü" #: rmt/rmt.c:446 -#, fuzzy msgid "Invalid seek offset" -msgstr "ºÎÀûÀýÇÑ ³¯Â¥ Çü½Ä `%s'" +msgstr "" #: rmt/rmt.c:452 msgid "Seek offset out of range" @@ -558,7 +553,7 @@ msgstr "" #: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608 #, fuzzy msgid "Invalid byte count" -msgstr "¿É¼Ç¿¡ ºÎÀûÀýÇÑ ¼ÒÀ¯ÀÚ°¡ ÁÖ¾îÁü" +msgstr "ºÎÀûÀýÇÑ ³¯Â¥ Çü½Ä `%s'" #: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625 msgid "Byte count out of range" @@ -573,7 +568,7 @@ msgstr "rmtd: #: rmt/rmt.c:601 #, fuzzy msgid "Invalid operation code" -msgstr "record_size·Î ºÎÀûÀýÇÑ °ª" +msgstr "¿É¼Ç¿¡ ºÎÀûÀýÇÑ ¼ÒÀ¯ÀÚ°¡ ÁÖ¾îÁü" #: rmt/rmt.c:636 rmt/rmt.c:680 msgid "Operation not supported" @@ -589,8 +584,8 @@ msgstr " msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "" @@ -598,10 +593,10 @@ msgstr "" msgid "set debug level" msgstr "" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "" @@ -626,115 +621,123 @@ msgid "Garbage command" msgstr "¾µ¸ð¾ø´Â ¸í·É" # -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "ÀÌ°ÍÀº tar ¾ÆÄ«À̺êó·³ º¸ÀÌÁö ¾Ê½À´Ï´Ù" # -#: src/buffer.c:521 src/buffer.c:530 +#: src/buffer.c:574 #, fuzzy -msgid "Total bytes written" +msgid "Total bytes read" msgstr "ÃÑ ¾²¿©Áø ¹ÙÀÌÆ®: " # -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:576 #, fuzzy -msgid "Total bytes read" +msgid "Total bytes written" msgstr "ÃÑ ¾²¿©Áø ¹ÙÀÌÆ®: " # -#: src/buffer.c:532 -#, fuzzy, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "ÃÑ ¾²¿©Áø ¹ÙÀÌÆ®: " -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "record_size·Î ºÎÀûÀýÇÑ °ª" # -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "¾ÆÄ«À̺ê À̸§ÀÌ ÁÖ¾îÁöÁö ¾Ê¾Ò½À´Ï´Ù" # -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Ç¥ÁØÀÔ/Ãâ·Â ¾ÆÄ«À̺긦 °ËÁõÇÒ ¼ö ¾ø½À´Ï´Ù" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" # -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "¾ÐÃàµÈ ¾ÆÄ«À̺긦 °»½ÅÇÒ ¼ö ¾ø½À´Ï´Ù" # -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "Å×ÀÌÇÁÀÇ ½ÃÀÛ ºÎºÐ¿¡¼­ Áö±Ý Á¾·áÇÔ" # -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "¿À·ù°¡ ³Ê¹« ¸¹¾Æ¼­ Á¾·áÇÕ´Ï´Ù" -#: src/buffer.c:893 +#: src/buffer.c:944 #, fuzzy, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "·¹ÄÚµå Å©±â = %d ºí·°" msgstr[1] "·¹ÄÚµå Å©±â = %d ºí·°" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "" msgstr[1] "" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "" # -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, fuzzy, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "º¼·ý #%d(%s¸¦ À§ÇÑ)¸¦ ÁغñÇÏ°í ¸®ÅÏÀ» Ä¡¼¼¿ä: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "»ç¿ëÀÚÀÇ ÀÀ´äÀÌ ÇÊ¿äÇÑ °÷¿¡ EOF°¡ ÀÖÀ½" # -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "°æ°í: ¾ÆÄ«À̺갡 ºÒ¿ÏÀüÇÕ´Ï´Ù" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -746,77 +749,77 @@ msgstr "" " ! ¼­ºê¼ÐÀ» ½ÇÇàÇÕ´Ï´Ù\n" " ? ÀÌ ¸ñ·ÏÀ» ÀμâÇÕ´Ï´Ù\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr "" # -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "»õ º¼·ýÀÌ ¾Æ´Ô; Á¾·á.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "" # -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, fuzzy, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s´Â ÀÌ º¼·ý¿¡ ¿¬¼ÓµÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù" # -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s´Â ÀÌ º¼·ý¿¡ ¿¬¼ÓµÇ¾î ÀÖÁö ¾Ê½À´Ï´Ù" # -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, fuzzy, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s´Â À߸øµÈ Å©±âÀÔ´Ï´Ù (%ld != %ld + %ld)" # -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "ÀÌ º¼·ýÀº ¼ø¼­¸¦ ¹þ¾î³µ½À´Ï´Ù" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, fuzzy, c-format msgid "Archive not labeled to match %s" msgstr "`%s'¿Í ÀÏÄ¡Çϵµ·Ï ¶óº§ÀÌ ºÙÁö ¾ÊÀº ¾ÆÄ«À̺ê" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, fuzzy, c-format msgid "Volume %s does not match %s" msgstr "º¼·ý `%s'°¡ `%s'¿Í ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" # -#: src/buffer.c:1866 +#: src/buffer.c:1917 #, fuzzy msgid "write did not end on a block boundary" msgstr "ºí·° °æ°è°¡ ¾Æ´Ñ ºÎºÐ¿¡¼­ ¾ÆÄ«À̺ê %sÀÇ EOF °ËÃâ" @@ -829,19 +832,19 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "%d ¹ÙÀÌÆ®(%ld ¹ÙÀÌÆ® Áß)¸¸ ÀÐÀ» ¼ö ÀÖ½À´Ï´Ù" msgstr[1] "%d ¹ÙÀÌÆ®(%ld ¹ÙÀÌÆ® Áß)¸¸ ÀÐÀ» ¼ö ÀÖ½À´Ï´Ù" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 #, fuzzy msgid "Contents differ" msgstr "¸ðµå°¡ ´Ù¸¨´Ï´Ù" # -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "¾ÆÄ«À̺꿡 ¿¹±âÄ¡ ¾ÊÀº EOF" # -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 #, fuzzy msgid "File type differs" msgstr "Å©±â°¡ ´Ù¸¨´Ï´Ù" @@ -866,7 +869,7 @@ msgid "Mod time differs" msgstr "º¯°æ ½Ã°¢ÀÌ ´Ù¸¨´Ï´Ù" # -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Å©±â°¡ ´Ù¸¨´Ï´Ù" @@ -888,38 +891,38 @@ msgid "Device number differs" msgstr "ÀåÄ¡ ¹øÈ£°¡ ¹Ù²î¾úÀ½" # -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "°ËÁõ " # -#: src/compare.c:471 +#: src/compare.c:473 #, fuzzy, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "%s: ¾Ë ¼ö ¾ø´Â ÆÄÀÏ Å¸ÀÔ; ÆÄÀÏÀÌ ¹«½ÃµÊ" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "" -#: src/compare.c:533 +#: src/compare.c:535 msgid "Archive contains transformed file names." msgstr "" -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "" # -#: src/compare.c:612 +#: src/compare.c:614 #, fuzzy, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "°ËÁõ ½ÇÆÐ: %d°³ÀÇ ºÎÀûÀýÇÑ Çì´õ°¡ °ËÃâµÊ" msgstr[1] "°ËÁõ ½ÇÆÐ: %d°³ÀÇ ºÎÀûÀýÇÑ Çì´õ°¡ °ËÃâµÊ" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "" @@ -969,62 +972,62 @@ msgstr[0] "%s: msgstr[1] "%s: ÆÄÀÏÀÌ %d ¹ÙÀÌÆ® ÁÙ¾îµë, (¿Í¿ì!)" # -#: src/create.c:1180 +#: src/create.c:1182 #, fuzzy, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: ´Ù¸¥ ÆÄÀϽýºÅÛ »ó¿¡ ÀÖÀ½; ´ýÇÁµÇÁö ¾ÊÀ½" # -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 #, fuzzy msgid "contents not dumped" msgstr " (ÄÚ¾î Ãâ·ÂµÊ)" # -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: ¾Ë ¼ö ¾ø´Â ÆÄÀÏ Å¸ÀÔ; ÆÄÀÏÀÌ ¹«½ÃµÊ" # -#: src/create.c:1549 +#: src/create.c:1551 #, fuzzy, c-format msgid "Missing links to %s." msgstr " %s·Î ¸µÅ©\n" # -#: src/create.c:1710 +#: src/create.c:1712 #, fuzzy, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: º¯°æµÇÁö ¾Ê¾Ò½À´Ï´Ù; ´ýÇÁµÇÁö ¾ÊÀ½" # -#: src/create.c:1719 +#: src/create.c:1721 #, fuzzy, c-format msgid "%s: file is the archive; not dumped" msgstr "%s´Â ¾ÆÄ«À̺êÀÔ´Ï´Ù; ´ýÇÁµÇÁö ¾ÊÀ½" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "" # -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "´ÙÀ½ Çì´õ·Î °Ç³Ê ¶Ü" @@ -1072,7 +1075,7 @@ msgid "%s: Cannot extract -- file is continued from another volume" msgstr "`%s'¸¦ ÃßÃâÇÒ ¼ö ¾ø½À´Ï´Ù -- ÀÌ ÆÄÀÏÀº ´Ù¸¥ º¼·ý¿¡ ¿¬¼ÓµÇ¾î ÀÖ½À´Ï´Ù" # -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 #, fuzzy msgid "Unexpected long name header" msgstr "¾ÆÄ«À̺ê ÆÄÀÏ¿¡ ¿¹±âÄ¡ ¾ÊÀº EOF" @@ -1123,265 +1126,265 @@ msgstr "%s: msgid "%s: Directory has been renamed" msgstr "%s µð·ºÅ丮´Â À̸§ÀÌ ¹Ù²î¾ú½À´Ï´Ù" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "" -#: src/incremen.c:1045 +#: src/incremen.c:1047 #, fuzzy msgid "Invalid modification time" msgstr "¿É¼Ç¿¡ ºÎÀûÀýÇÑ ¸ðµå°¡ ÁÖ¾îÁü" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" msgstr "" # -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "¾ÆÄ«À̺ê ÆÄÀÏ¿¡ ¿¹±âÄ¡ ¾ÊÀº EOF" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" msgstr "" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" msgstr "" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "" # -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "%s·Î µð·ºÅ丮¸¦ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "" # -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s¸¦ Áö¿ò\n" # -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, fuzzy, c-format msgid "%s: Cannot remove" msgstr "%s¸¦ Áö¿ï ¼ö ¾ø½À´Ï´Ù" # -#: src/list.c:189 +#: src/list.c:217 #, fuzzy, c-format msgid "%s: Omitting" msgstr "%s¸¦ »ý·«" -#: src/list.c:206 +#: src/list.c:235 #, fuzzy, c-format msgid "block %s: ** Block of NULs **\n" msgstr "ºí·° %10ld: ** NUL·Î µÈ ºí·° **\n" -#: src/list.c:232 +#: src/list.c:261 #, fuzzy, c-format msgid "block %s: ** End of File **\n" msgstr "ºí·° %10ld: ** ÆÄÀÏÀÇ ³¡ **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, fuzzy, c-format msgid "block %s: " msgstr "ºí·° %10ld: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" # -#: src/list.c:854 +#: src/list.c:883 #, fuzzy, c-format msgid "Archive base-256 value is out of %s range" msgstr "ÀÌ º¼·ýÀº ¼ø¼­¸¦ ¹þ¾î³µ½À´Ï´Ù" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "" # -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " %s·Î ¸µÅ©\n" # -#: src/list.c:1270 +#: src/list.c:1302 #, fuzzy, c-format msgid " unknown file type %s\n" msgstr " ¾Ë ¼ö ¾ø´Â ÆÄÀÏ Å¸ÀÔ `%c'\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "" # -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--º¼·ý Çì´õ--\n" # -#: src/list.c:1304 +#: src/list.c:1336 #, fuzzy, c-format msgid "--Continued at byte %s--\n" msgstr "--%ld ¹ÙÀÌÆ® °¿¡ °è¼ÓµÊ--\n" # -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "µð·ºÅ丮¸¦ ¸¸µå´Â Áß:" # -#: src/misc.c:721 +#: src/misc.c:726 #, fuzzy, c-format msgid "Renaming %s to %s\n" msgstr "%s¸¦ %s·Î À̸§ ¹Ù²Þ" # -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, fuzzy, c-format msgid "%s: Cannot rename to %s" msgstr "%s¸¦ %s·Î À̸§À» ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù" # -#: src/misc.c:754 +#: src/misc.c:759 #, fuzzy, c-format msgid "Renaming %s back to %s\n" msgstr "%s¸¦ %s·Î À̸§ ¹Ù²Þ" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "" @@ -1395,73 +1398,73 @@ msgid "%s: file list requested from %s already read from %s" msgstr "" # -#: src/names.c:448 +#: src/names.c:448 src/checkpoint.c:274 #, fuzzy, c-format msgid "cannot split string '%s': %s" -msgstr "%s¸¦ statÇÒ ¼ö ¾ø½À´Ï´Ù" +msgstr "%s¸¦ %s·Î ±âÈ£¸µÅ©ÇÒ ¼ö ¾ø½À´Ï´Ù" #: src/names.c:490 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" # -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: ¾ÆÄ«À̺꿡 ¾øÀ½" # -#: src/names.c:842 +#: src/names.c:845 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: ¾ÆÄ«À̺꿡 ¾øÀ½" -#: src/names.c:876 +#: src/names.c:879 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "`%s'¿Í ÀÏÄ¡Çϵµ·Ï ¶óº§ÀÌ ºÙÁö ¾ÊÀº ¾ÆÄ«À̺ê" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "`-%s'°ú `-%s' ¿É¼ÇÀº ¸ðµÎ Ç¥ÁØ ÀÔ·ÂÀÌ ÇÊ¿äÇÕ´Ï´Ù" -#: src/tar.c:163 +#: src/tar.c:164 #, fuzzy, c-format msgid "%s: Invalid archive format" msgstr "ºÎÀûÀýÇÑ ³¯Â¥ Çü½Ä `%s'" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "" -#: src/tar.c:255 +#: src/tar.c:264 #, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." msgstr "" -#: src/tar.c:364 +#: src/tar.c:378 msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1472,7 +1475,7 @@ msgid "" " tar -xf archive.tar # Extract all files from archive.tar.\n" msgstr "" -#: src/tar.c:373 +#: src/tar.c:387 msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" "The version control may be set with --backup or VERSION_CONTROL, values " @@ -1484,81 +1487,81 @@ msgid "" " never, simple always make simple backups\n" msgstr "" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "" # -#: src/tar.c:411 +#: src/tar.c:425 #, fuzzy msgid "create a new archive" msgstr "¾ÆÄ«À̺꿡 ¿¹±âÄ¡ ¾ÊÀº EOF" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1566,621 +1569,646 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "" # -#: src/tar.c:469 +#: src/tar.c:483 #, fuzzy msgid "remove files after adding them to the archive" msgstr "¾ÆÄ«À̺꿡 ÀÖ´Â À̸§µé¿¡¼­ µå¶óÀ̺ê ÁöÁ¤¹®À» Á¦°ÅÇÔ" -#: src/tar.c:471 +#: src/tar.c:485 msgid "don't replace existing files when extracting, treat them as errors" msgstr "" -#: src/tar.c:474 +#: src/tar.c:488 msgid "don't replace existing files when extracting, silently skip over them" msgstr "" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:490 +#: src/tar.c:504 msgid "preserve existing symlinks to directories when extracting" msgstr "" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " "place (METHOD='system')" msgstr "" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" msgstr "" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:554 +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 msgid "Handling of extended file attributes:" msgstr "" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" msgstr "" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" msgstr "" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" msgstr "" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" msgstr "" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" msgstr "" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" msgstr "" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" msgstr "" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" msgstr "" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "" # -#: src/tar.c:603 +#: src/tar.c:627 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "´ÙÁß-º¼·ý ¾ÆÄ«À̺긦 °ËÁõÇÒ ¼ö ¾ø½À´Ï´Ù" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" # -#: src/tar.c:629 +#: src/tar.c:653 #, fuzzy msgid "Archive format selection:" msgstr "Ç¥ÁØÀԷ¿¡ ´ëÇÑ ¾ÆÄ«À̺ê" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:660 +#: src/tar.c:684 #, fuzzy msgid "Compression options:" msgstr "Çò°¥¸®´Â ¾ÐÃà ¿É¼Ç" -#: src/tar.c:662 +#: src/tar.c:686 #, fuzzy msgid "use archive suffix to determine the compression program" msgstr "¾ÐÃà ÇÁ·Î±×·¥¿¡ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: src/tar.c:664 +#: src/tar.c:688 #, fuzzy msgid "do not use archive suffix to determine the compression program" msgstr "¾ÐÃà ÇÁ·Î±×·¥¿¡ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:687 -msgid "DIR" -msgstr "" - # -#: src/tar.c:688 +#: src/tar.c:712 #, fuzzy msgid "change to directory DIR" msgstr "%s·Î µð·ºÅ丮¸¦ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +msgid "unquote input file or member names (default)" msgstr "" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +msgid "do not unquote input file or member names" msgstr "" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "" # -#: src/tar.c:729 +#: src/tar.c:761 #, fuzzy msgid "don't strip leading '/'s from file names" msgstr "Àý´ë ¸µÅ©µé¿¡¼­ ¾Õ¿¡ ºÙÀº `/'¸¦ Á¦°ÅÇÔ" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:735 +#: src/tar.c:767 msgid "begin at member MEMBER-NAME when reading the archive" msgstr "" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "" -#: src/tar.c:767 +#: src/tar.c:799 msgid "patterns match after any '/' (default for exclusion)" msgstr "" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "" -#: src/tar.c:775 -#, fuzzy +#: src/tar.c:807 msgid "wildcards do not match '/'" -msgstr "º¼·ý `%s'°¡ `%s'¿Í ÀÏÄ¡ÇÏÁö ¾Ê½À´Ï´Ù" +msgstr "" -#: src/tar.c:777 +#: src/tar.c:809 msgid "wildcards match '/' (default for exclusion)" msgstr "" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2188,239 +2216,237 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:802 -#, fuzzy +#: src/tar.c:834 msgid "print file modification times in UTC" -msgstr "¿É¼Ç¿¡ ºÎÀûÀýÇÑ ¸ðµå°¡ ÁÖ¾îÁü" +msgstr "" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "" # -#: src/tar.c:810 +#: src/tar.c:842 #, fuzzy msgid "ask for confirmation for every action" msgstr "»ç¿ëÀÚÀÇ È®ÀÎÀ» ÀÐÀ» ¼ö ¾ø½À´Ï´Ù" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:978 +#: src/tar.c:1010 #, fuzzy msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" msgstr "`-Acdtrux' ¿É¼Ç Áß Çϳª ÀÌ»óÀ» ÁöÁ¤ÇÏ¸é ¾È µË´Ï´Ù" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Çò°¥¸®´Â ¾ÐÃà ¿É¼Ç" -#: src/tar.c:1047 +#: src/tar.c:1079 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr "¾Ë ¼ö ¾ø´Â ÆÐÅÏ `%s'" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "" -#: src/tar.c:1108 +#: src/tar.c:1140 #, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1295 +#: src/tar.c:1330 #, fuzzy msgid "Invalid owner or group ID" msgstr "¿É¼Ç¿¡ ºÎÀûÀýÇÑ ¼ÒÀ¯ÀÚ°¡ ÁÖ¾îÁü" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "¿É¼Ç¿¡ ºÎÀûÀýÇÑ ¸ðµå°¡ ÁÖ¾îÁü" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1926 +#: src/tar.c:1993 #, fuzzy msgid "Invalid record size" msgstr "record_size·Î ºÎÀûÀýÇÑ °ª" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "·¹ÄÚµå Å©±â´Â %dÀÇ ¹è¼ö°¡ µÇ¾î¾ß ÇÕ´Ï´Ù." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:2133 +#: src/tar.c:2205 #, fuzzy, c-format msgid "Unknown density: '%c'" msgstr "¾Ë ¼ö ¾ø´Â ÆÐÅÏ `%s'" -#: src/tar.c:2150 +#: src/tar.c:2222 #, fuzzy, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "`-[0-7][lmh]' ¿É¼ÇÀº ÀÌ tar¿¡¼± Áö¿øµÇÁö ¾Ê½À´Ï´Ù" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "" -#: src/tar.c:2306 +# +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 +#, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "%s¿¡ ¾µ ¼ö ¾ø½À´Ï´Ù" + +#: src/tar.c:2389 #, fuzzy, c-format msgid "Old option '%c' requires an argument." msgstr "¿À·¡µÈ ¿É¼Ç `%c'´Â Àμö°¡ ÇÊ¿äÇÕ´Ï´Ù." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2389 -#, c-format -msgid "--occurrence cannot be used with %s" -msgstr "" - -#: src/tar.c:2408 +#: src/tar.c:2490 #, fuzzy msgid "Multiple archive files require '-M' option" msgstr "´ÙÁß ¾ÆÄ«À̺ê ÆÄÀÏÀº `-M' ¿É¼ÇÀÌ ÇÊ¿äÇÕ´Ï´Ù" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" @@ -2428,80 +2454,76 @@ msgstr[0] "" msgstr[1] "" # -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "´ÙÁß-º¼·ý ¾ÆÄ«À̺긦 °ËÁõÇÒ ¼ö ¾ø½À´Ï´Ù" # -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "¾ÐÃàµÈ ¾ÆÄ«À̺긦 °ËÁõÇÒ ¼ö ¾ø½À´Ï´Ù" -#: src/tar.c:2450 -#, c-format -msgid "--verify cannot be used with %s" -msgstr "" - # -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "¾ÐÃàµÈ ´ÙÁß-º¼·ý ¾ÆÄ«À̺긦 »ç¿ëÇÒ ¼ö ¾ø½À´Ï´Ù" # -#: src/tar.c:2461 +#: src/tar.c:2543 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "¾ÐÃàµÈ ¾ÆÄ«À̺긦 °»½ÅÇÒ ¼ö ¾ø½À´Ï´Ù" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2478 +#: src/tar.c:2560 msgid "--acls can be used only on POSIX archives" msgstr "" -#: src/tar.c:2483 +#: src/tar.c:2565 msgid "--selinux can be used only on POSIX archives" msgstr "" -#: src/tar.c:2488 +#: src/tar.c:2570 msgid "--xattrs can be used only on POSIX archives" msgstr "" -#: src/tar.c:2493 -#, c-format -msgid "--%s option cannot be used with %s" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "" -#: src/tar.c:2565 +#: src/tar.c:2669 #, fuzzy msgid "Options '-Aru' are incompatible with '-f -'" msgstr "`-Aru' ¿É¼ÇÀº `-f -'°ú µ¿½Ã¿¡ ¾µ ¼ö ¾ø½À´Ï´Ù" -#: src/tar.c:2660 +#: src/tar.c:2766 #, fuzzy msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" msgstr "`-Acdtrux' ¿É¼Çµé Áß Çϳª¸¦ ÁöÁ¤ÇØ¾ß ÇÕ´Ï´Ù" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + # #: src/update.c:87 #, fuzzy, c-format @@ -2510,98 +2532,98 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: ÆÄÀÏÀÌ %d ¹ÙÀÌÆ® ÁÙ¾îµë, (¿Í¿ì!)" msgstr[1] "%s: ÆÄÀÏÀÌ %d ¹ÙÀÌÆ® ÁÙ¾îµë, (¿Í¿ì!)" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" msgstr "" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "" -#: src/xheader.c:740 +#: src/xheader.c:741 #, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "" @@ -2610,7 +2632,7 @@ msgstr "" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, fuzzy, c-format msgid "Write checkpoint %u" msgstr "°Ë»çÁöÁ¡ %d¸¦ ¾¸" @@ -2620,7 +2642,7 @@ msgstr " #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, fuzzy, c-format msgid "Read checkpoint %u" msgstr "°Ë»çÁöÁ¡ %d¸¦ ÀÐÀ½" @@ -2690,12 +2712,8 @@ msgid "Synchronous execution options:" msgstr "" #: tests/genfile.c:163 -#, fuzzy msgid "OPTION" msgstr "" -"\n" -"»ç¿ë¹ý: %s [¿É¼Ç]...\n" -"\n" #: tests/genfile.c:164 msgid "" @@ -2831,7 +2849,7 @@ msgstr "%s #: tests/genfile.c:692 #, fuzzy, c-format msgid "cannot truncate `%s'" -msgstr "%s¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù" +msgstr "%s¸¦ statÇÒ ¼ö ¾ø½À´Ï´Ù" #: tests/genfile.c:701 #, c-format @@ -2842,7 +2860,7 @@ msgstr "" #: tests/genfile.c:706 #, fuzzy, c-format msgid "cannot unlink `%s'" -msgstr "%s¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù" +msgstr "¸µÅ© %s¸¦ ÀÐÀ» ¼ö ¾ø½À´Ï´Ù" #: tests/genfile.c:833 #, c-format @@ -2879,60 +2897,6 @@ msgstr "" msgid "--stat requires file names" msgstr "" -# -#, fuzzy -#~ msgid "Cannot get working directory" -#~ msgstr "%s·Î µð·ºÅ丮¸¦ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù" - -# -#, fuzzy -#~ msgid "Read error in snapshot file" -#~ msgstr "%s¿¡¼­ Àб⠿À·ù" - -# -#, fuzzy -#~ msgid "Unexpected field value in snapshot file" -#~ msgstr "¾ÆÄ«À̺ê ÆÄÀÏ¿¡ ¿¹±âÄ¡ ¾ÊÀº EOF" - -#, fuzzy -#~ msgid "Invalid group" -#~ msgstr "¿É¼Ç¿¡ ºÎÀûÀýÇÑ ¼ÒÀ¯ÀÚ°¡ ÁÖ¾îÁü" - -# -#, fuzzy -#~ msgid "%s: Directory removed before we read it" -#~ msgstr "%s µð·ºÅ丮´Â À̸§ÀÌ ¹Ù²î¾ú½À´Ï´Ù" - -# -#, fuzzy -#~ msgid "Cannot restore working directory" -#~ msgstr "%s·Î µð·ºÅ丮¸¦ ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù" - -# -#, fuzzy -#~ msgid "Cannot resolve hostname %s" -#~ msgstr "%s¸¦ %s·Î À̸§À» ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù" - -# -#~ msgid "Reading %s\n" -#~ msgstr "%s¸¦ Àд Áß\n" - -# -#~ msgid "rmtd: Cannot allocate buffer space\n" -#~ msgstr "rmtd: ¹öÆÛ °ø°£À» ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù\n" - -# -#~ msgid "Cannot allocate buffer space" -#~ msgstr "¹öÆÛ °ø°£À» ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù" - -# -#~ msgid "Try `%s --help' for more information.\n" -#~ msgstr "´õ ¸¹Àº Á¤º¸¸¦ º¸·Á¸é `%s --help' ÇϽʽÿÀ.\n" - -# -#~ msgid "Premature end of file" -#~ msgstr "À߸øµÈ ÆÄÀÏ ³¡" - #~ msgid "Cannot close file #%d" #~ msgstr "ÆÄÀÏ #%d¸¦ ´ÝÀ» ¼ö ¾ø½À´Ï´Ù" @@ -3006,6 +2970,14 @@ msgstr "" #~ msgid "Only wrote %u of %u bytes to %s" #~ msgstr "%u ¹ÙÀÌÆ®(%u ¹ÙÀÌÆ® Áß)¸¸ %s¿¡ ½è½À´Ï´Ù" +# +#~ msgid "Read error on %s" +#~ msgstr "%s¿¡¼­ Àб⠿À·ù" + +# +#~ msgid "Reading %s\n" +#~ msgstr "%s¸¦ Àд Áß\n" + # #~ msgid "WARNING: No volume header" #~ msgstr "°æ°í: º¼·ý Çì´õ ¾øÀ½" @@ -3189,10 +3161,6 @@ msgstr "" #~ msgid "Visible longname error" #~ msgstr "°¡½ÃÀûÀÎ ±äÀ̸§ ¿À·ù" -# -#~ msgid "Cannot symlink %s to %s" -#~ msgstr "%s¸¦ %s·Î ±âÈ£¸µÅ©ÇÒ ¼ö ¾ø½À´Ï´Ù" - # #~ msgid "Symlinked %s to %s" #~ msgstr "%s¿¡¼­ %s·Î ±âÈ£¸µÅ©µÇ¾úÀ½" @@ -3201,6 +3169,18 @@ msgstr "" #~ msgid "Missing file name after -C" #~ msgstr "-C µÚ¿¡ ÆÄÀÏ À̸§ÀÌ ºüÁ³À½" +# +#~ msgid "rmtd: Cannot allocate buffer space\n" +#~ msgstr "rmtd: ¹öÆÛ °ø°£À» ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù\n" + +# +#~ msgid "Cannot allocate buffer space" +#~ msgstr "¹öÆÛ °ø°£À» ÇÒ´çÇÒ ¼ö ¾ø½À´Ï´Ù" + +# +#~ msgid "Premature end of file" +#~ msgstr "À߸øµÈ ÆÄÀÏ ³¡" + # #~ msgid "rmtd: Garbage command %c\n" #~ msgstr "rmtd: ¾µ¸ð¾ø´Â ¸í·É %c\n" @@ -3414,6 +3394,13 @@ msgstr "" #~ "ÀÖÀ¸¸ç, ¿©±â¼­ FILEÀº ÆÄÀÏÀ̳ª ÀåÄ¡°¡ µÉ ¼ö ÀÖ½À´Ï´Ù. ÀÌ `tar'ÀÇ\n" #~ "³»Á¤°ªÀº `-f%s -b%d'ÀÔ´Ï´Ù.\n" +#~ msgid "" +#~ "\n" +#~ "Report bugs to .\n" +#~ msgstr "" +#~ "\n" +#~ "·Î ¹ö±×¸¦ º¸°íÇØ ÁֽʽÿÀ.\n" + #~ msgid "Obsolete option, now implied by --blocking-factor" #~ msgstr "--blocking-factor¿¡ Æ÷ÇÔµÇ¾î ¾µ¸ð¾ø°Ô µÈ ¿É¼Ç" diff --git a/po/ky.gmo b/po/ky.gmo index 252659a..778ba91 100644 Binary files a/po/ky.gmo and b/po/ky.gmo differ diff --git a/po/ky.po b/po/ky.po index 9ae85cd..1bc00b4 100644 --- a/po/ky.po +++ b/po/ky.po @@ -3,12 +3,12 @@ # This file is distributed under the same license as the PACKAGE package. # Azilet Beishenaliev , 2007. # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" "Project-Id-Version: tar 1.18\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" "PO-Revision-Date: 2007-09-01 01:06+0100\n" "Last-Translator: Azilet Beishenaliev \n" "Language-Team: Kirghiz \n" @@ -104,7 +104,7 @@ msgstr "Бул жардам тизмеÑин көрÑÓ©Ñ‚Ó©Ñ‚" msgid "give a short usage message" msgstr "Колдонуу жөнүндө кыÑка маалымат көрÑÓ©Ñ‚Ó©Ñ‚" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "ÐТЫ" @@ -395,9 +395,7 @@ msgstr "Каталарды бул жерге билдиргиле %s.\n" #: gnu/version-etc.c:249 #, fuzzy, c-format msgid "Report %s bugs to: %s\n" -msgstr "" -"\n" -"Каталарды бул жерге билдиргиле <%s>.\n" +msgstr "Каталарды бул жерге билдиргиле %s.\n" #: gnu/version-etc.c:253 #, c-format @@ -417,7 +415,7 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: %s кылалбайтат" @@ -426,60 +424,60 @@ msgstr "%s: %s кылалбайтат" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: ЭÑкертүү: %s кылалбайтат" # mode: права доÑтупа, муну укук абалы деп койдум # жакшыраак вариант болÑо алмаштырыш керек -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: Укук абалын %s түрүнө алмаштыралбай калды" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: ЭÑлик uid = %lu, gid = %lu деп алмашпай койду" # hard link'ти түз шилтеме дебатам # symbolic болÑо Ñимволикалык болот -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: %s'ке түз шилтеме болбойтат" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%1$s: %3$lu байт окуу учурунда %2$s адреÑинде ката байт окуду" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" msgstr[0] "" "%1$s: ЭÑкертүү: %3$lu байт окуу учурунда %2$s адреÑинде ката байт окуду" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: %s орунуна баралбай жатат" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: ЭÑкертүү: %s орунуна баралбай жатат" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: %s'ке Ñимволикалык шилтеме жаÑалбайтат" # %s: жалпы %2$lu байттан %1$lu байт гана жазылды -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -584,8 +582,8 @@ msgstr "Ðрхивде күтүлбөгөн жерде файлдын Ñоңу msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "N" @@ -593,10 +591,10 @@ msgstr "N" msgid "set debug level" msgstr "" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "ФÐЙЛ" @@ -618,101 +616,109 @@ msgstr "аргументтердин Ñаны көп" msgid "Garbage command" msgstr "Туура ÑÐ¼ÐµÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Бул tar-архиви ÑÐ¼ÐµÑ Ð¾ÐºÑˆÐ¾Ð¹Ñ‚" -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" -msgstr "Жазылган жалпы байт" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" msgstr "Ðлынган жалпы байт" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "Жазылган жалпы байт" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Өчүрүлгөн жалпы байт: %s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(канал)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "record_size мааниÑи жарабайт" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Ðрхивдин аты берилген жок" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Ðрхивдин stdin/stdout текшерүүÑÒ¯ болбой жатат" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Ðрхив кыÑыштырылган абалда. %s опциÑÑын колдонгула" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "КыÑыштырылган архивдерди жаңырталбай калды" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "Лентанын башына келди, иш бүттү" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "Өтө көп ката бар, иш бүттү" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Маалыматтын көлөмү = %lu блок" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "Ðрхивде түз жайлашпаган блок бар (%lu байт)" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "Ðрхивдеги файл өчпөй калды; архив ачылбаÑа -i деп колдонгула" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek маалыматтын чегинде токтогон жок" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: жаракÑыз том номери бар" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "Томдун номери батпай калды" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "%2$s үчүн %1$d-томду даÑрдап Enter'ди баÑыңыз: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "Колдонуучудан жооп күтүбатканда файлдын Ñоңу келип калды" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "ЭСКЕРТҮҮ: Ðрхив толук ÑмеÑ" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -723,72 +729,72 @@ msgstr "" " q\t\ttar программаÑынын ишин бүтүр\n" "y же Ввод\t\tИшти улант\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Команда ÑтрокаÑын ач\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? Бул тизмени жаз\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Жаңы том жок; иш бүттү.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "Файлдын аты берилген жок. Кайра жазып көргүлө.\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Туура ÑÐ¼ÐµÑ Ð²Ð²Ð¾Ð´. Жардам үчүн ? жазгыла.\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "%s командаÑÑ‹ аткарылбай калды" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s бул томдо уланÑа керек: башкы-маалыматта аты кыÑкартылыптыр" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s мунун бул томдо уландыÑÑ‹ жок" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s көлөмү туура ÑÐ¼ÐµÑ (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Бул том иретте ÑмеÑ" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "Ðрхивдин тамгаÑÑ‹ %s менен келишпей жатат" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "%s тому %s менен келишпей жатат" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" "%s: файлдын аты көп-томдук GNU башкы-маалымат үчүн Ó©Ñ‚Ó© узун, кыÑкартылды" -#: src/buffer.c:1866 +#: src/buffer.c:1917 #, fuzzy msgid "write did not end on a block boundary" msgstr "rmtlseek маалыматтын чегинде токтогон жок" @@ -799,16 +805,16 @@ msgid "Could only read %lu of %lu byte" msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "%2$lu байттан %1$lu гана окулду" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "Мазмундары окшобойт" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "Ðрхивде күтүлбөгөн жерде файлдын Ñоңу бар" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "Файл түрү окшошпойт" @@ -828,7 +834,7 @@ msgstr "Gid окшошпойт" msgid "Mod time differs" msgstr "Ðлмаштыруу убактылары окшошпойт" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Көлөмү окшошпойт" @@ -845,36 +851,36 @@ msgstr "Символикалык шилтеме окшошпойт" msgid "Device number differs" msgstr "ÐÑпап номери окшошпойт" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Текшерүү " -#: src/compare.c:471 +#: src/compare.c:473 #, fuzzy, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "%s: `%c' файл түрү бүлгиÑиз, жөнөкөй файл катары Ñалыштырды" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "Ðрхивдин ичинде префикÑтери алынган файл аттары бар." -#: src/compare.c:533 +#: src/compare.c:535 #, fuzzy msgid "Archive contains transformed file names." msgstr "Ðрхивде ÑÑки түрдөгү base-64 башкы-маалымат бар" -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "Текшерүү учурунда алгачкы файлдар табылбай калышы мүмкүн." -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "ТЕКШЕРҮҮ КÐТÐСЫ: %d жаракÑыз башкы маалымат табылды" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "%s болгон жерде нөлдүк блок бар" @@ -919,55 +925,55 @@ msgid "%s: File shrank by %s byte; padding with zeros" msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "%s: Файл %s байтка азайды; нөлдөр менен толтурулат" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: файл башка файл-ÑиÑтемаÑында; кошулбайт" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "аÑтындагылар кошулган жок" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Файлдын түрү белгиÑиз; файл каралбайт" -#: src/create.c:1549 +#: src/create.c:1551 #, fuzzy, c-format msgid "Missing links to %s." msgstr "%s жака шилтемелер жок.\n" -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: файл алмашкан жок; кошулбайт" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: файл архив Ñкен; кошулбайт" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "папка кошулган жок" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: файлды окуу учурунда файл алмашты" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: Ñокет каралбайт" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: door каралбайт" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Эмики башкы-маалыматка Ó©Ñ‚Ñ‚Ò¯" @@ -1013,7 +1019,7 @@ msgstr "Символикалык шилтемелерди түз шилтеме msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Чыгарылган жок -- файл башка томдон уланып келиптир" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" msgstr "Башкы-маалымат узун" @@ -1057,156 +1063,156 @@ msgstr "%s: файл башка файл-ÑиÑтемаÑында; кошулб msgid "%s: Directory has been renamed" msgstr "%s: Папка алмаштырылды" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "ЖаракÑыз убакыт тамгаÑÑ‹" -#: src/incremen.c:1045 +#: src/incremen.c:1047 #, fuzzy msgid "Invalid modification time" msgstr "Ðлмашуу убагы туура ÑÐ¼ÐµÑ (Ñекундалары)" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "Ðлмашуу убагы туура ÑÐ¼ÐµÑ (нано-Ñекундалары)" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "ÐÑпаптын номери жаракÑыз " -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Inode номери жаракÑыз" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" msgstr "" # snapshot? -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" msgstr "СнÑпшот файлда күтүлбөгөн жерде файлдын Ñоңу (EOF) бар" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" msgstr "" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" msgstr "" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "ЗапиÑьтерди бөлүүчү Ñимвол жок" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "Файлдын форматы туура ÑмеÑ" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "Форматтын бул верÑиÑÑÑ‹ иштетиле албайт: %" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Кошулуучу папка бузук: '%c' күтүлгөн бирок %#3o келди" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Кошулуучу папка бузук: 'X' копиÑлары бар" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Кошулуучу папка бузук: 'R' менен берилген ат бош" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Кошулуучу папка бузук: 'T'дан мурун 'R' жок" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Кошулуучу папка бузук: 'T' менен берилген ат бош" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "Кошулуучу папка бузук: '%c' күтүлгөн бирок датанын Ñоңу келди" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "Кошулуучу папка бузук: 'X' Ñч колдонулган жок" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "%s шаблонун колдонуп убактылуу жаңы папка ачылган жок" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Папка өчүрүлгөн жок: stat иштебей койду" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: бул папка башка аÑпапта жайгашкан: өчүрүлбөйт" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s өчүрүлүп жатат\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: Өчүрүлбөй жатат" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: Муну аттады" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "блок %s: ** нөлдөр болгон блок **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "блок %s: ** Файлдын Ñоңу **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "блок %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Башкы-маалыматта Ñан түрүндө %s болотурган жерде бош жерлер бар" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1214,89 +1220,89 @@ msgstr "" "Ñкилик ÑиÑтемадагы терÑи алынды" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "" "Ðрхивдин Ñегиздик ÑиÑтемадагы мааниÑи болгон %.*s %s диапазонунун тышында" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "Ðрхивде ÑÑки түрдөгү base-64 башкы-маалымат бар" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Ðрхивдеги base-64 түрүндөгү %s Ñөзү %s диапазонунун тышында" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Ðрхивдин base-256 мааниÑи %s диапазонунун тышында" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "" "Ðрхивдин ичинде %.*s бар, алардын ордунда Ñан түрүндө %s болушу керек Ñле" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Ðрхивдин %s мааниÑи %s түрүнүн %s..%s диапазонунда ÑмеÑ" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " %s жака шилтеме\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " белгиÑиз файл түрү %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--Узун шилтеме--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--Узун ат--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Томдун башкы-маалыматы--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--%s-байттан баштап уланды--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Жаңы папка ачылыбатат:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "%s'тин атын %s деп алмаштырды\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: ÐÑ‚Ñ‹ %s деп алмаштыралбай калды" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "%s'тин атын кайра %s деп алмаштырды\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Файл окулганча өчүрүлүп кетти" @@ -1304,11 +1310,11 @@ msgstr "%s: Файл окулганча өчүрүлүп кетти" # оруÑчада дочерный процеÑÑ, бир процеÑÑ Ó©Ð· ичинен жаңы бир # процеÑÑ Ð¶Ð°Ñ€Ð°Ñ‚ÐºÐ°Ð½Ð´Ð° ошол чайлд процеÑÑ Ð±Ð¾Ð»Ð¾Ñ‚. Биз Ñмне дейбиз? # Мен туулган процеÑÑ Ð´ÐµÐ¹Ð¼. -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "туулган процеÑÑ" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "процеÑÑ-аралык канал" @@ -1322,7 +1328,7 @@ msgstr "%s командаÑÑ‹ аткарылбай калды" msgid "%s: file list requested from %s already read from %s" msgstr "%s: файл тизмеÑи окулган" -#: src/names.c:448 +#: src/names.c:448 src/checkpoint.c:274 #, fuzzy, c-format msgid "cannot split string '%s': %s" msgstr "`%s'ке убакыт аталган жок" @@ -1332,12 +1338,12 @@ msgstr "`%s'ке убакыт аталган жок" msgid "%s: file name read contains nul character" msgstr "%s: алынган файлдын атында бош тамгалар бар" -#: src/names.c:821 +#: src/names.c:824 #, fuzzy msgid "Pattern matching characters used in file names" msgstr "Файлдын аттарында уйкаштарды издөө үчүн колдонулган тамгалар бар." -#: src/names.c:823 +#: src/names.c:826 #, fuzzy msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " @@ -1345,45 +1351,45 @@ msgid "" msgstr "" "Уйкаштарды издөө үчүн --wildcards опциÑÑын колдонуңуз, же --no-wildcards" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: Ðрхивде табылган жок" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Керектүү нерÑелер архивде табылган жок" -#: src/names.c:876 +#: src/names.c:879 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "Ðрхивдин тамгаÑÑ‹ %s менен келишпей жатат" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "`-%s' жана `-%s' опциÑларына Ñтандарт кирүү(input) керек" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s: Ðрхивдин форматы жарабайт" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "Бул форматтагы архив үчүн жарабаган GNU өзгөчөлүктөрү Ñуралууда" -#: src/tar.c:255 +#: src/tar.c:264 #, fuzzy, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." @@ -1391,7 +1397,7 @@ msgstr "" "Ковычкалардын түрү белгиÑиз - `%s'. Тизмени көрүүгө `%s --quoting-" "style=help' жазгыла." -#: src/tar.c:364 +#: src/tar.c:378 #, fuzzy msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " @@ -1414,7 +1420,7 @@ msgstr "" " tar -xf archive.tar # ÐÑ‚Ñ‹ archive.tar болгон архивдин ичиндеги " "баардык файлдарды чыгарат.\n" -#: src/tar.c:373 +#: src/tar.c:387 #, fuzzy msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1437,82 +1443,82 @@ msgstr "" "жөнөкөй вариант\n" " never, simple ар дайым жөнөкөй резерв копиÑлар Ñакталат\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "Ðегизги иштөө абалы:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "архивдин ичиндеги файлдарды тизмелейт" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "архивден файлдарды чыгарат" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "жаңы архив жаратат" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "архив менен файл ÑиÑтема айырмаларын табат" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "файлдарды архивдин аÑгына кошот" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "архивдин ичиндегилерден жаңы болгон файлдарды гана кошот" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "tar файлын архивге кошот" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "архивден өчүрөт (магниттик ленталарда жарабайт!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "архивдик томдун атын текшерет анан бүтүрөт" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "Иштөөнүн модификаторлору:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "кеңири жайлашкан файлдарды Ñфектүү түрдө колго ал" # major, minor -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "БÐШКЫ[.КИЙИÐКИ]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" "кеңири жайлаштыруу форматынын верÑиÑÑын тандайт (--sparce опциÑÑÑ‹ кошулган " "болот)" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "ÑÑки GNU форматындагы резервдөө методун колго ал" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "жаңы GNU форматындагы резервдөө методун колго ал" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "окулбаган файлдар келгенде нөл болбогон ÑÑ‚Ð°Ñ‚ÑƒÑ Ð¼ÐµÐ½ÐµÐ½ ишти бүтүрбө" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1524,134 +1530,142 @@ msgstr "" "файлдардын аттары команда ÑтрокаÑында же -T опциÑÑÑ‹ менен берилгенде гана " "жарактуу болот. N-дин мааниÑи алдынала 1ге барабар." -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "Ðрхивдин ичиндегилерди издеÑе болот" -#: src/tar.c:453 +#: src/tar.c:467 #, fuzzy msgid "archive is not seekable" msgstr "Ðрхивдин ичиндегилерди издеÑе болот" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "Ò¯Ñтүнө көчүрүү контролу:" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "архивди Ñактагандан кийин текшерүүгө аракет кылат" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "файлдарды архивге кошулгандан кийин өчүрөт" -#: src/tar.c:471 +#: src/tar.c:485 #, fuzzy msgid "don't replace existing files when extracting, treat them as errors" msgstr "файлдарды чыгаруу учурунда мурун бар болгон файлдардын ордуна көчүрбө" -#: src/tar.c:474 +#: src/tar.c:488 #, fuzzy msgid "don't replace existing files when extracting, silently skip over them" msgstr "файлдарды чыгаруу учурунда мурун бар болгон файлдардын ордуна көчүрбө" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "мурун бар болгон файл архивдеги копиÑÑындан жаңы болÑо аны алмаштырба" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "чыгаруу учурунда мурун бар болгон файлдардын ордуна көчүрөт" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "бар болгон файлдын ордуна көчүрүүдөн мурун ал файлды өчүрөт" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "папканы чыгарардан мурун баардык иерархиÑларды өчүрөт" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "мурун бар болгон папкалардын мета-каÑиеттерин корго" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "чыгаруу учурунда бар болгон папкалардын мета-даталардын Ò¯Ñтүнө жазылат " "(алдынала тандалат)" -#: src/tar.c:490 +#: src/tar.c:504 #, fuzzy msgid "preserve existing symlinks to directories when extracting" msgstr "чыгаруу учурунда мурун бар болгон файлдардын ордуна көчүрөт" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "ПÐПКÐ" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "Чыгаруу() жолун танда:" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "файлдарды Ñтандарт чыгарууга (output) жөнөт" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "КОМÐÐДÐ" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "" "архивден чыккан файлдарды канал(pipe) жолу менен башка программага жөнөтөт" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "туулган процеÑÑтердин бүтүрүү кодторуна караба" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "туулган процеÑÑтердин нөл болбогон бүтүрүү кодторун ката деп ишке ал" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Файлдын өзгөчөлүктөрүн колго алууда:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "кошулган файлдардын ÑÑÑин ÐТЫ деп кой" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "кошулган файлдардын группаÑын ÐТЫ деп кой" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "ДÐТÐ-ЖЕ-ФÐЙЛ" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "кошулган файлдардын алмашуу убактыÑын ДÐТÐ-ЖЕ-ФÐЙЛ дан ал" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "УКУК" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "кошулган файлдардын укук абалын УКУК деп кой" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "МЕТОД" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " @@ -1661,32 +1675,32 @@ msgstr "" "Ñакта (МЕТОД='replace'; алдынала тандалат) же колдонуу убакыттарын " "алмашырбай туруп Ñактап кал (МЕТОД='system')" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "файлдын алмаштыруу убактын чыгарбайт" -#: src/tar.c:528 +#: src/tar.c:545 #, fuzzy msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" msgstr "ÑÑÑин ошол бойдон калтырып файлдарды чыгарууга аракет кылат" -#: src/tar.c:530 +#: src/tar.c:547 #, fuzzy msgid "extract files as yourself (default for ordinary users)" msgstr "файлдарды өзүңдүкү катары чыгарат" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "ÑÑÑи/группа аттарын ардайым номерлер менен көрÑÓ©Ñ‚Ó©Ñ‚" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" "файлдын урукÑат маалыматын да чыгар (Ñуперколдонуучуга алдынала тандалат)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1694,16 +1708,16 @@ msgstr "" "архивден урукÑат маалыматын чыгарыбатканда колдонуучунун umask'ын колдон " "(жөн колдонуучуларга алдынала тандлат)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "-p жана -s менен бирдей" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1711,182 +1725,190 @@ msgstr "" "чыгарылган папкалардын колдонуу убакыттарын жана урукÑаттарын чыгаруу иши " "бүткөндөн кийин коёт" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "--delay-directory-restore опциÑÑынын Ñффектин токтотот" -#: src/tar.c:554 +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 #, fuzzy msgid "Handling of extended file attributes:" msgstr "Файлдын өзгөчөлүктөрүн колго алууда:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" msgstr "" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" msgstr "" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" msgstr "" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" msgstr "" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" msgstr "" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" msgstr "" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" msgstr "" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" msgstr "" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "ÐÑпапты тандоо жана ага Ó©Ñ‚Ò¯Ò¯:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ÐРХИВ" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "ÐРХИВ деген архивдик файлды же аÑпапты колдонот" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "архивдик файлда Ñки точка болушуна карабаÑтан ал локалдуу" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "rmt'нин ордуна КОМÐÐДРколдонулат" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "rsh'тын ордуна КОМÐÐДРколдонулат" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "драйв жана анын тыгыздыгын белгиле" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "көп томдуу архивди жарат/тизмеле/чыгар" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "N x 1024 байт жазгандан кийин лентаны алмаштыр" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "ар лентанын аÑгында Ñкриптти иштет (-M опциÑÑÑ‹ колдонулат)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "ФÐЙЛ файлынын ичиндеги том номерин колдон/жаңырт" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "ÐÑпаптын блоктолушу:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "БЛОК" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "ар маалыматка БЛОК x 512 байт түшөт" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "ÐÑ€ маалыматка N байт түшөт, 512 көбөйтүндүÑÒ¯" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "архивдеги нөлдүү блокторду өтүп кетет (EOF жөнүндө)" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "окубатканда кайрадан блокторго бөлүп чык (4.2BSD каналдары үчүн)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "Ðрхивдин форматын тандоо:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "ФОРМÐТ" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "тандалган форматта архив жаратат" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "ФОРМÐТ булардан бирөө болот:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "ÑÑки V7 tar форматы" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "tar <= 1.12 верÑиÑÑында болгондой GNU форматы" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x форматы" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) форматы" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) форматы" # pax деген gid,atime ÑиÑктуу нерÑелер -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "pax менен бирдей" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "--format=v7 менен бирдей" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "--format=posix менен бирдей" # keyword Ñмне болот? -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "ачкыч-Ñөз[[:]=мааниÑи][,ачкыч-Ñөз[[:]=мааниÑи]]..." -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "контролдоо үчүн pax ачкыч Ñөздөрү" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "ТЕКСТ" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1894,78 +1916,76 @@ msgstr "" "том аты ТЕКСТ болгон архив жарат; тизмелөө/чыгаруу учурунда, ТЕКСТ дегенди " "том атынын глоб шаблону катары колдон" -#: src/tar.c:660 +#: src/tar.c:684 #, fuzzy msgid "Compression options:" msgstr "Бирбирине келишпеген кыÑыштыруу опциÑлары берилди" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "ПРОГ" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "ПРОГ менен ишке ал (-d опциÑÑÑ‹ болушу керек)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "Локалдуу файлдарды тандоо:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "ФÐЙЛды архивге кош (файлдын аты тире менен баштаган учурда пайдалуу)" -#: src/tar.c:687 -msgid "DIR" -msgstr "ПÐПКÐ" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "ПÐПКРпапкаÑына Ó©Ñ‚" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "чыгарылатурган же жаңы ачылатурган файлдарды ÐТЫ деген файлдан кара" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "-T опциÑÑÑ‹ нөл менен бүткөн аттарды окуйт, -C опциÑÑÑ‹ өчүрүлөт" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" msgstr "" "-T менен алынган файлдардын аттарындагы ковычкалар өчүрүлөт (алдынала " "тандалат)" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" msgstr "-T менен алынган файлдардын аттарындагы ковычкалар калаберет" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "ШÐБЛОÐ" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "ШÐБЛОРменен уйкаш файлдар ишке алынбайт" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "ФÐЙЛда тизмеленген шаблондор менен уйкаш файлдар ишке алынбайт" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1973,98 +1993,112 @@ msgstr "" "CACHEDIR.TAG файлы болгон папкалардын аÑтындагылары Ñ‚Ñг файлдан тышкарыÑÑ‹ " "кошулбайт" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "CACHEDIR.TAG файлы болгон папкалардын аÑтындагыларынын баары кошулбайт" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "CACHEDIR.TAG файлы болгон папкалар кошулбайт" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" "ФÐЙЛ файлы болгон папкалардын аÑтындагылары ФÐЙЛ файлындан тышкарыÑÑ‹ " "кошулбайт" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "ФÐЙЛ файлы болгон папкалардын аÑтындагыларынын баары кошулбайт" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "ФÐЙЛ файлы болгон папкалар кошулбайт" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "папкалардын тереңине кирип кетүүнү токтот" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "архивди жаÑабатканда локалдуу файл ÑиÑтемаÑында кал" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "папкалардын тереңине кирет (алдынала тандалган)" -#: src/tar.c:729 +#: src/tar.c:761 #, fuzzy msgid "don't strip leading '/'s from file names" msgstr "файл аттарынын башындагы '/'терди өчүрбө" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "" "Ñимволикалык шилтемелерге барат; алар көрÑөткөн файлдарды архивге кошот" -#: src/tar.c:733 +#: src/tar.c:765 #, fuzzy msgid "follow hard links; archive and dump the files they refer to" msgstr "" "Ñимволикалык шилтемелерге барат; алар көрÑөткөн файлдарды архивге кошот" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "МҮЧӨÐÒ®Ð-ÐТЫ" -#: src/tar.c:735 +#: src/tar.c:767 #, fuzzy msgid "begin at member MEMBER-NAME when reading the archive" msgstr "архивдеги МҮЧӨÐÒ®Ð-ÐТЫ мүчөÑүнөн башта" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "ДÐТÐ-ЖЕ-ФÐЙЛ'дан жаңы болгон файлдарды гана Ñакта" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "ДÐТÐ" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "датаÑÑ‹ алмашканда гана дата жана убактыÑын Ñалыштыр" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "CONTROL" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "өчүрөрдөн мурун копиÑÑын Ñактап кал, CONTROL верÑиÑÑын танда" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "STRING" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -2072,105 +2106,105 @@ msgstr "" "өчүрөрдөн мурун копиÑÑын Ñактап калат, жалпы колдонулган ÑÑƒÑ„Ð¸ÐºÑ ÐºÐ¾ÑˆÑƒÐ»Ð°Ñ‚ (бул " "ÑÑƒÑ„Ð¸ÐºÑ SIMPLE_BACKUP_SUFFIX жолу менен алмаштырылбаган болÑо '~' болот)" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "Файлдын атынын алмашуулары:" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "чыгаруу учурунда файл аттарынын башындагы N компонентти алып Ñалат" # выражение кыргызча кандай? СҮЙЛӨМ башка жерде да бар -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "СҮЙЛӨМ" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "файлдардын аттарын алмаштыруу үчүн sed replace EXPRESSION колдонгула" # inclusion, exclusion - Kyrgyz equiv? -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "Файлдын атына уйкаштыруу опциÑлары (бардык шаблондорго тиешелүү):" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "тамгалардын чоң-кичинеÑине каралбайт" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "шаблондор файлдын атынын башталышы менен уйкаштырылат" -#: src/tar.c:767 +#: src/tar.c:799 #, fuzzy msgid "patterns match after any '/' (default for exclusion)" msgstr "" "шаблондор `/' Ñимволунан кийин келген ар жерде уйкашына каралат (алдынала " "тандалган)" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "уйкаштырууда тамгалардын чоң-кичинеÑине каралат (алдынала тандалган)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "шаблондор колдонулат (иштен алынбаган файлдарга алдынала тандалат)" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "кандай жазылÑа ошондой колдонулат" -#: src/tar.c:775 +#: src/tar.c:807 #, fuzzy msgid "wildcards do not match '/'" msgstr "шаблондор `/' Ñимволун издебейт" -#: src/tar.c:777 +#: src/tar.c:809 #, fuzzy msgid "wildcards match '/' (default for exclusion)" msgstr "шаблондор `/' Ñимволун издейт (алдынала тандалган)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Маалыматтандыруу:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "ишке алынган файлдарды кеңири маалыматы менен тизмеле" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "" -#: src/tar.c:787 +#: src/tar.c:819 #, fuzzy msgid "warning control" msgstr "Ò¯Ñтүнө көчүрүү контролу:" # Ушу 'record' Ñөзүнө жакшы котормо табалбай койдум # 'маалымат' деп жазыбаттым Ñле, бул жерде келишпей калаткен -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "ар N запиÑьтен кийин маалымат берип турат (алдынала 10 болот)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "баардык шилтемелер кошулбай калÑа билдирүү жазып чыгар" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "СИГÐÐЛ" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2182,36 +2216,36 @@ msgstr "" "SIGHUP, SIGQUIT, SIGINT, SIGUSR1 жана SIGUSR2; SIG префикÑи жазылбаган " "аттарын да колдонÑо болот." -#: src/tar.c:802 +#: src/tar.c:834 #, fuzzy msgid "print file modification times in UTC" msgstr "файлды алмаштыруу датаÑын UTC түрүндө көрÑÓ©Ñ‚" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "чыккан кеңири маалыматты ФÐЙЛ файлына жибер" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "ар билдирүүдө архивдин ичиндеги блок номерин көрÑÓ©Ñ‚" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "ар ишти аткарууга макулдук Ñурап тур" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "tar'да алдынала коюлган опциÑларды көрÑÓ©Ñ‚Ó©Ñ‚" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2219,33 +2253,33 @@ msgstr "" "тизмелөө же чыгаруу учурунда издөө критериÑÑына жатпаган папкаларды да " "тизмелейт" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "алмаштыруудан кийин файлдын же архивдин аттарын көрÑÓ©Ñ‚Ó©Ñ‚" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "СТИЛЬ" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "" "аттарга ковычка кошуу Ñтилин тандаңыз; жарактуу СТИЛЬ түрдөрү төмөндө " "көрÑөтүлөт." -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "STRING ичинде болгон тамгаларга кошумча ковычка кошот" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "STRING ичинде болгон тамгаларга ковычка кошпойт" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "Келишүү опциÑлары:" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2253,56 +2287,56 @@ msgstr "" "жаңы архив жаÑабатканда --old-archive менен бирдей; чыгарыбатканда --no-same-" "owner менен бирдей" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "Башка опциÑлар:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "зыÑндуу көрүнгөн опциÑларды колдонууга тыюуу Ñалат" -#: src/tar.c:978 +#: src/tar.c:1010 #, fuzzy msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" msgstr "`-Acdtrux' опциÑларынан бирөөнү гана колдоно алаÑыңар" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Бирбирине келишпеген кыÑыштыруу опциÑлары берилди" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "Сигналдын аты белгиÑиз: %s" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "Датанын шаблон файлы табылган жок" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "БелгиÑиз %1$s дата форматынын ордуна %2$s коюлат" -#: src/tar.c:1108 +#: src/tar.c:1140 #, fuzzy, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "%s опциÑÑÑ‹: `%s' датаÑын %s деп алды" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, fuzzy, c-format msgid "filter the archive through %s" msgstr "архивди gzip менен ишке ал" -#: src/tar.c:1179 +#: src/tar.c:1214 #, fuzzy msgid "Valid arguments for the --quoting-style option are:" msgstr "--quoting-style опциÑÑÑ‹ үчүн мындай аргументтер бар:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2310,300 +2344,294 @@ msgstr "" "\n" "*Бул* tar алдынала мындай иштетилет:\n" -#: src/tar.c:1295 +#: src/tar.c:1330 #, fuzzy msgid "Invalid owner or group ID" msgstr "ЭÑÑи жарабайт" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Блок көлөмү жаракÑыз" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "Лентанын узундугу жаракÑыз" -#: src/tar.c:1466 +#: src/tar.c:1521 #, fuzzy msgid "Invalid incremental level value" msgstr "Файлдын форматы туура ÑмеÑ" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "Бирден көп ченемдөөчү дата бар" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "кеңири жайлаштыруу форматынын верÑиÑÑÑ‹ жарактуу ÑмеÑ" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "Бул платформада --atime-preserve='system' опциÑÑÑ‹ иштебейт" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "--checkpoint опциÑÑына жазылган аргумент Ñан ÑмеÑ" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "ОпциÑда жарабаган укук абалы берилди" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "Жарабаган номер" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Маалымат көлөмү жарабайт" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "Маалыматтын көлөмү %d көбөйтүндүÑÒ¯ болушу керек." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "Элементтердин Ñаны жарабайт" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "--to-command опциÑÑÑ‹ бир Ñле жолу жазылыш керек" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "Тыгыздык аргументи туура ÑмеÑ: %s" -#: src/tar.c:2133 +#: src/tar.c:2205 #, fuzzy, c-format msgid "Unknown density: '%c'" msgstr "ТүшүнүкÑүз тыгыздык: `%c'" -#: src/tar.c:2150 +#: src/tar.c:2222 #, fuzzy, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "*Бул* tar `-[0-7][lmh]' опциÑларын иштетпейт" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[ФÐЙЛ]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 +#, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "%s шаблону колдонулбайт" + +#: src/tar.c:2389 #, fuzzy, c-format msgid "Old option '%c' requires an argument." msgstr "ЭÑки болгон `%c' опциÑÑына параметр керек." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "Файл тизмеÑи болбоÑо --occurrence дегендин мааниÑи болбойт" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "Колдонулган иштетүү абалда --occurrence колдонулбайт" - -#: src/tar.c:2408 +#: src/tar.c:2490 #, fuzzy msgid "Multiple archive files require '-M' option" msgstr "Бир нече архив файлы болÑо `-M' опциÑÑÑ‹ колдонулушу керек" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "--listed-incremental менен --newer чогу колдонулбайт" - -#: src/tar.c:2416 +#: src/tar.c:2498 #, fuzzy msgid "--level is meaningless without --listed-incremental" msgstr "Файл тизмеÑи болбоÑо --occurrence дегендин мааниÑи болбойт" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "%s: Томдун тамгаÑÑ‹ Ó©Ñ‚Ó© узун (ÑÒ£ көп %lu байт боло алат)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Көп-томдуу архивдерди текшералбай калды" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "КыÑыштырылган архивдерди текшералбай калды" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "%s шаблону колдонулбайт" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Көп-томдуу кыÑыштырылган архивдерди колдоналбай калды" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "КыÑыштырылган архивдер кошулалбайт" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option POSIX архивдеринде гана колдонула алат" -#: src/tar.c:2478 +#: src/tar.c:2560 #, fuzzy msgid "--acls can be used only on POSIX archives" msgstr "--pax-option POSIX архивдеринде гана колдонула алат" -#: src/tar.c:2483 +#: src/tar.c:2565 #, fuzzy msgid "--selinux can be used only on POSIX archives" msgstr "--pax-option POSIX архивдеринде гана колдонула алат" -#: src/tar.c:2488 +#: src/tar.c:2570 #, fuzzy msgid "--xattrs can be used only on POSIX archives" msgstr "--pax-option POSIX архивдеринде гана колдонула алат" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "%s шаблону колдонулбайт" - -#: src/tar.c:2525 -msgid "Volume length cannot be less than record size" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" msgstr "" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" +#: src/tar.c:2630 +msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "Бош архив жаратуудан уÑлып баш тартып жатат" -#: src/tar.c:2565 +#: src/tar.c:2669 #, fuzzy msgid "Options '-Aru' are incompatible with '-f -'" msgstr "`-Aru' опциÑлары `-f -' менен келишпейт" -#: src/tar.c:2660 +#: src/tar.c:2766 #, fuzzy msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" msgstr "`-Acdtrux' опциÑларынан бирөөнү тандап колдонуңуз" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: Файл %s байтка азайды" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "%s Ñөзү белигÑиз же азырынча киргизилген ÑмеÑ" -#: src/xheader.c:173 +#: src/xheader.c:174 #, fuzzy msgid "Time stamp is out of allowed range" msgstr "Сан жарактуу маанилердин тышында: %s" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "%s шаблону колдонулбайт" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "%s ачкыч Ñөзү алмаштырылбайт" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "Кеңейтилген башкы-маалымат бузук: узундук жок" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "Кеңейтилген башкы-маалыматтын узундугу - %*s - диапазондун тышында" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "" "Кеңейтилген башкы-маалымат бузук: узундуктан кийин бош жер (пробел) жок" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "Кеңейтилген башкы-маалымат бузук: барабар Ñимволу жок" # newline Ñмне болот? -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "Кеңейтилген башкы-маалымат бузук: жаңы Ñап жок" -#: src/xheader.c:740 +#: src/xheader.c:741 #, fuzzy, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "Кеңейтилген башкы-маалыматта белгиÑиз `%s' Ñөзү каралбайт" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "Чыккан ачкыч-Ñөз/маани Ñкилиги ото узун (ачкыч-Ñөз=%s, узундугу=%s)" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "%s=%s түрүндөгү кеңейтилген башкы-маалымат %s..%s диапазондун тышында" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Кеңейтилген башкы-маалымат бузук: %s=%s туура ÑмеÑ" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Кеңейтилген башкы-маалымат бузук: %s=%s ашыкча көп" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" "Кеңейтилген башкы-маалымат бузук: туура ÑÐ¼ÐµÑ %s: күтүлбөгөн жерде бул - %c - " "бөлүүчү Ñимвол бар" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "Кеңейтилген башкы-маалымат бузук: туура ÑÐ¼ÐµÑ %s: так Ñанда маани бар" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, fuzzy, c-format msgid "%s: not a valid timeout" msgstr "%s: ЖаракÑыз группа" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "" @@ -2611,7 +2639,7 @@ msgstr "" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "Жазууну текшерүү жери: %u" @@ -2620,7 +2648,7 @@ msgstr "Жазууну текшерүү жери: %u" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "Окуунун текшерүү жери: %u" @@ -2885,76 +2913,21 @@ msgstr "Команда жабылды\n" msgid "--stat requires file names" msgstr "--stat опциÑÑÑ‹ менен файл аттары жазылыш керек" -#, fuzzy -#~ msgid "Cannot get working directory" -#~ msgstr "Учурдагы папка алмаштырылбайтат" - #~ msgid "sort names to extract to match archive" #~ msgstr "чыгатурган файлдарды архивдегидей кылып Ñортто" -# фиелд, ÑнÑпшот дегендер кандай болот? -#~ msgid "Field too long while reading snapshot file" -#~ msgstr "СнÑпшот файлды окубатканда ото узун поле чыкты" - -# snapshot? -#~ msgid "Read error in snapshot file" -#~ msgstr "СнÑпшот файлды окубатканда ката болду" - -# фиелд кандай болот? snapshot? -#~ msgid "Unexpected field value in snapshot file" -#~ msgstr "СнÑпшот файлда күтүлбөгөн поле(фиелд) бар" - -#~ msgid "Extended header length is out of allowed range" -#~ msgstr "Кеңейтилген башкы-маалыматтын узундугу жарактуу маанилердин тышында" - -#, fuzzy -#~ msgid "Invalid group" -#~ msgstr "%s: ЖаракÑыз группа" - -#, fuzzy -#~ msgid "%s: Directory removed before we read it" -#~ msgstr "%s: Файл окулганча өчүрүлүп кетти" - #, fuzzy -#~ msgid "Cannot restore working directory" -#~ msgstr "Учурдагы папка Ñакталбайтат" +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "Колдонулган иштетүү абалда --occurrence колдонулбайт" -#, fuzzy -#~ msgid "Cannot resolve hostname %s" -#~ msgstr "%s файлы %s деп алмаштыралбай калды" - -#~ msgid "suppress this warning." -#~ msgstr "опциÑÑÑ‹ менен бул ÑÑкертүүнү көрÑÓ©Ñ‚Ð¿Ó©Ñ ÐºÑ‹Ð»." +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "--listed-incremental менен --newer чогу колдонулбайт" #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: мындай Ð¾Ð¿Ñ†Ð¸Ñ ÐºÐ¾Ð»Ð´Ð¾Ð½ÑƒÐ»Ð±Ð°Ð¹Ñ‚ -- %c\n" -#~ msgid "Reading %s\n" -#~ msgstr "%s жактан окуп жатат\n" - -#~ msgid "" -#~ "\n" -#~ "Report bugs to <%s>.\n" -#~ msgstr "" -#~ "\n" -#~ "Каталарды бул жерге билдиргиле <%s>.\n" - -#~ msgid "filter the archive through bzip2" -#~ msgstr "архивди bzip2 менен ишке ал" - -#~ msgid "filter the archive through gzip" -#~ msgstr "архивди gzip менен ишке ал" - -#~ msgid "filter the archive through compress" -#~ msgstr "архивди compress менен ишке ал" - -#, fuzzy -#~ msgid "filter the archive through lzma" -#~ msgstr "архивди gzip менен ишке ал" - -#, fuzzy -#~ msgid "filter the archive through lzop" -#~ msgstr "архивди gzip менен ишке ал" +#~ msgid "block size" +#~ msgstr "бир блоктун көлөмү" # Input string дегендин ордуна жакшы нерÑе билÑеңер алмаштырÑаңар болот #~ msgid "Input string too long" @@ -2986,17 +2959,45 @@ msgstr "--stat опциÑÑÑ‹ менен файл аттары жазылыш к #~ " --version ВерÑÐ¸Ñ Ð¼Ð°Ð°Ð»Ñ‹Ð¼Ð°Ñ‚Ñ‹Ð½ көрÑÓ©Ñ‚.\n" #~ " --help Бул маалыматты көрÑÓ©Ñ‚.\n" +#~ msgid "" +#~ "\n" +#~ "Report bugs to <%s>.\n" +#~ msgstr "" +#~ "\n" +#~ "Каталарды бул жерге билдиргиле <%s>.\n" + #~ msgid "Seek offset error" #~ msgstr "Издөө даражаÑÑ‹ туура ÑмеÑ" #~ msgid "Premature end of file" #~ msgstr "Файлдын Ñоңу Ñрте келди" +#~ msgid "Reading %s\n" +#~ msgstr "%s жактан окуп жатат\n" + #~ msgid "Error is not recoverable: exiting now" #~ msgstr "Оңолбогон ката: иш бүттү " -#~ msgid "block size" -#~ msgstr "бир блоктун көлөмү" +# фиелд, ÑнÑпшот дегендер кандай болот? +#~ msgid "Field too long while reading snapshot file" +#~ msgstr "СнÑпшот файлды окубатканда ото узун поле чыкты" + +# snapshot? +#~ msgid "Read error in snapshot file" +#~ msgstr "СнÑпшот файлды окубатканда ката болду" + +# фиелд кандай болот? snapshot? +#~ msgid "Unexpected field value in snapshot file" +#~ msgstr "СнÑпшот файлда күтүлбөгөн поле(фиелд) бар" + +#~ msgid "suppress this warning." +#~ msgstr "опциÑÑÑ‹ менен бул ÑÑкертүүнү көрÑÓ©Ñ‚Ð¿Ó©Ñ ÐºÑ‹Ð»." + +#~ msgid "filter the archive through bzip2" +#~ msgstr "архивди bzip2 менен ишке ал" + +#~ msgid "filter the archive through compress" +#~ msgstr "архивди compress менен ишке ал" #~ msgid "[.]NUMBER" #~ msgstr "[.]N" @@ -3007,3 +3008,6 @@ msgstr "--stat опциÑÑÑ‹ менен файл аттары жазылыш к #~ msgid "Error exit delayed from previous errors" #~ msgstr "Ката үчүн ишти бүтүрүү, мурунку каталардан улам кеч аткарылды" + +#~ msgid "Extended header length is out of allowed range" +#~ msgstr "Кеңейтилген башкы-маалыматтын узундугу жарактуу маанилердин тышында" diff --git a/po/ms.gmo b/po/ms.gmo index 04f9c23..13d5596 100644 Binary files a/po/ms.gmo and b/po/ms.gmo differ diff --git a/po/ms.po b/po/ms.po index 952f103..fae62a8 100644 --- a/po/ms.po +++ b/po/ms.po @@ -2,12 +2,12 @@ # Copyright (C) 2002 Free Software Foundation, Inc. # Hasbullah Bin Pit , 2002. # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" "Project-Id-Version: tar 1.13.25\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" "PO-Revision-Date: 2002-11-23 02:38+0800\n" "Last-Translator: Hasbullah Bin Pit \n" "Language-Team: Malay \n" @@ -100,7 +100,7 @@ msgstr "" msgid "give a short usage message" msgstr "" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "" @@ -391,9 +391,7 @@ msgstr "" #: gnu/version-etc.c:249 #, fuzzy, c-format msgid "Report %s bugs to: %s\n" -msgstr "" -"\n" -"Lapor pepijat ke .\n" +msgstr "Menukarnama %s kembali ke %s\n" #: gnu/version-etc.c:253 #, c-format @@ -413,7 +411,7 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: Tak dapat %s" @@ -422,56 +420,56 @@ msgstr "%s: Tak dapat %s" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: Amaran: Tak dapat %s" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: Tak dapat menukar mod ke %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: Tak dapat menukar pemilikan ke uid %lu, gid %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: Tak dapat memaut keras ke %s" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, fuzzy, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: ralat pembacaan pada byte %s, membaca %lu byte" msgstr[1] "%s: ralat pembacaan pada byte %s, membaca %lu byte" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, fuzzy, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Amaran: Ralat pembacaan pada byte %s, membaca %lu byte" msgstr[1] "%s: Amaran: Ralat pembacaan pada byte %s, membaca %lu byte" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: Tak dapat rayau ke %s" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: Amaran: tidak dapat rayau ke %s " -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: Tak dapat mencipta symlink ke %s" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, fuzzy, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -572,14 +570,20 @@ msgstr "" #: rmt/rmt.c:664 #, fuzzy msgid "Unexpected arguments" -msgstr "EOF tanpa diduga pada arkib" +msgstr "Penghujungan tanpa diduga data imej PNM" #: rmt/rmt.c:689 +#, fuzzy msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "" +"Penggunaan: %s [OPSYEN]\n" +"Manupulasi pemacu pita, menerima arahan drpd proses jauh.\n" +"\n" +" --version Output maklumat versi.\n" +" --help Output bantuan ini.\n" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "" @@ -587,10 +591,10 @@ msgstr "" msgid "set debug level" msgstr "" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "" @@ -601,7 +605,7 @@ msgstr "" #: rmt/rmt.c:715 rmt/rmt.c:783 #, fuzzy, c-format msgid "cannot open %s" -msgstr "%s: Tak dapat rayau ke %s" +msgstr "Tak dapat tutup" #: rmt/rmt.c:780 tests/genfile.c:892 tests/genfile.c:909 #, c-format @@ -612,106 +616,114 @@ msgstr "" msgid "Garbage command" msgstr "Arahan sampah" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Ia nampaknya bukan seperti arkib tar" -#: src/buffer.c:521 src/buffer.c:530 +#: src/buffer.c:574 +msgid "Total bytes read" +msgstr "" + +#: src/buffer.c:576 #, fuzzy msgid "Total bytes written" msgstr "Jumlah byte ditulis: %s (%sB, %sB/s)\n" -#: src/buffer.c:528 src/buffer.c:542 -msgid "Total bytes read" -msgstr "" - -#: src/buffer.c:532 -#, fuzzy, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Jumlah byte ditulis: %s (%sB, %sB/s)\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(paip)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "Nilai tidak sah bagi record_size" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Tiada nama arkib diberi" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Tak dapat menentusahkan arkib stdin/stdout" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Tak dapat mengemaskini arkib termampat" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "Pada permulaan pita, keluar sekarang" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "Terlalu banyak ralat, keluar" -#: src/buffer.c:893 +#: src/buffer.c:944 #, fuzzy, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Saiz rekod = %lu blok" msgstr[1] "Saiz rekod = %lu blok" -#: src/buffer.c:914 +#: src/buffer.c:965 #, fuzzy, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "Blok tidak dijajar (%lu byte) pada arkib" msgstr[1] "Blok tidak dijajar (%lu byte) pada arkib" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "tak dapat backspace fail arkib; ia mungkin tak boleh dibaca tanpa -i" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: mengandungi nombor volum yg tidak sah" -#: src/buffer.c:1109 +#: src/buffer.c:1160 #, fuzzy msgid "Volume number overflow" msgstr "Nombor volum melimpah" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Menyedia volum #%d bagi %s dan tekan return: " # libgnomeui/gnome-app-helper.c:127 -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "EOF dimana maklumbalas pengguna dijangka" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "AMARAN: Arkib tidak lengkap" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -723,71 +735,71 @@ msgstr "" " ! Spawn subshell\n" " ? Cetak senarai ini\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Tiada volum baru; keluar.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, fuzzy, c-format msgid "%s command failed" msgstr "Arahan '%s' gagal" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, fuzzy, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s tidak bersambung pada volum ini" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s tidak bersambung pada volum ini" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s adalah salah saiz (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Volum ini tidak dalam turutan" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "Arkib tidak dilabelkan supaya memadan %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "Volum %s tidak sepadan %s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "" @@ -798,16 +810,16 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Hanya boleh membaca %lu drpd %lu byte" msgstr[1] "Hanya boleh membaca %lu drpd %lu byte" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "Kandungan berlainan" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "EOF tanpa diduga pada arkib" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "Jenis fail berbeza" @@ -827,7 +839,7 @@ msgstr "Gid berbeza" msgid "Mod time differs" msgstr "Masa mod berbeza" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Saiz berbeza" @@ -844,36 +856,36 @@ msgstr "Symlink berbeza" msgid "Device number differs" msgstr "Nombor beranti berbeza" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Tentusah" -#: src/compare.c:471 -#, fuzzy, c-format +#: src/compare.c:473 +#, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "%s: Jenis fail tak dikenali '%c', berlainan dengan fail normal" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "" -#: src/compare.c:533 +#: src/compare.c:535 msgid "Archive contains transformed file names." msgstr "" -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "" -#: src/compare.c:612 +#: src/compare.c:614 #, fuzzy, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "GAGAL TENTUSAH: %d pengepala tak sah dikesan" msgstr[1] "GAGAL TENTUSAH: %d pengepala tak sah dikesan" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "" @@ -919,55 +931,55 @@ msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "%s: Fail mengucup sebanyak %s byte; pad dengan sifar" msgstr[1] "%s: Fail mengucup sebanyak %s byte; pad dengan sifar" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: fail adalah pada sistemfail lain; tidak dilonggokkan" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Jenis fail tak dikenali; fail diabaikan" -#: src/create.c:1549 +#: src/create.c:1551 #, fuzzy, c-format msgid "Missing links to %s." msgstr "Pautan ke %s\n" -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: fail tidak berubah; tidak dilonggokkan" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: fail adalah arkib; tidak dilonggokkan" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: fail berubah bila kami membacanya" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: soket diabaikan" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: pintu diabaikan" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Melangkah ke pengepala berikut" @@ -1013,13 +1025,13 @@ msgstr "Cuba mengekstrak pautan simbolik sebagai pautan keras" msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Tak dapat ekstrak -- fail bersambung dari volum lain" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 #, fuzzy msgid "Unexpected long name header" msgstr "Penghujungan tanpa diduga data imej PNM" #: src/extract.c:1542 -#, fuzzy, c-format +#, c-format msgid "%s: Unknown file type '%c', extracted as normal file" msgstr "%s: Jenis fail tak dikenali '%c', diekstrak sebagai fail biasa" @@ -1058,251 +1070,251 @@ msgstr "%s: fail adalah pada sistemfail lain; tidak dilonggokkan" msgid "%s: Directory has been renamed" msgstr "%s: Direktori telah ditukarnama" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "Setem masa tidak sah" -#: src/incremen.c:1045 +#: src/incremen.c:1047 #, fuzzy msgid "Invalid modification time" msgstr "Mod tidak sah diberi pada opsyen" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "Nombor peranti tidak sah" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Nombot inod tidak sah" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" msgstr "" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "EOF tanpa diduga pada arkib" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" msgstr "" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" msgstr "" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Tak dapat memperuntukkan memori bagi faktor pemblokan %d" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, fuzzy, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: fail adalah pada sistemfail lain; tidak dilonggokkan" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Memadam %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: tak dapat buang" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "blok %s: ** Blok TIADA **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Akhir Fail **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Pengepala kosong dimana nilai %s numerik dijangka" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "Nilai oktal arkib %.*s diluar julat %s; anggap kedua-dua pelengkap" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Nilai oktal arkib %.*s diluar julat %s" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Rentetan %s base-64 ditandatangani arkibadalah diluar julat %s " -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Nilai base-256 arkub adalah diluar julat %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Arkib mengandungi %.*s dimana nilai %s numerik dijangka" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Nilai %s arkib adalah dijuar julat %s %s..%s" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr "Pautan ke %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr "jenis fail tak diketahui %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Pengepala Volum--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Bersambung pada byte %s--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Mencipta direktori:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "Menukarnama %s ke %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Tak dapat menukarnama ke %s" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "Menukarnama %s kembali ke %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Fail dibuang sebelum kami membacanya" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "proses anak" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "saluran antaraproses" @@ -1312,75 +1324,75 @@ msgid "command line" msgstr "Arahan '%s' gagal" #: src/names.c:378 -#, fuzzy, c-format +#, c-format msgid "%s: file list requested from %s already read from %s" -msgstr "%s: fail adalah arkib; tidak dilonggokkan" +msgstr "" -#: src/names.c:448 -#, fuzzy, c-format +#: src/names.c:448 src/checkpoint.c:274 +#, c-format msgid "cannot split string '%s': %s" -msgstr "%s: Tak dapat rayau ke %s" +msgstr "" #: src/names.c:490 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: Tak dijumpai pada arkib" -#: src/names.c:842 +#: src/names.c:845 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Tak dijumpai pada arkib" -#: src/names.c:876 +#: src/names.c:879 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "Arkib tidak dilabelkan supaya memadan %s" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "Opsyen `-%s' dan `-%s' kedua-duanya memerlukan input piawai" -#: src/tar.c:163 +#: src/tar.c:164 #, fuzzy, c-format msgid "%s: Invalid archive format" msgstr "%s: Kumpulan tidak sah" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "" -#: src/tar.c:255 +#: src/tar.c:264 #, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." msgstr "" -#: src/tar.c:364 +#: src/tar.c:378 #, fuzzy msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " @@ -1400,7 +1412,7 @@ msgstr "" "verbose.\n" " %s -xf arkib.tar # Ekstrak semua fail drpd arkib.tar.\n" -#: src/tar.c:373 +#: src/tar.c:387 msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" "The version control may be set with --backup or VERSION_CONTROL, values " @@ -1412,80 +1424,80 @@ msgid "" " never, simple always make simple backups\n" msgstr "" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "" -#: src/tar.c:411 +#: src/tar.c:425 #, fuzzy msgid "create a new archive" msgstr "EOF tanpa diduga pada arkib" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1493,614 +1505,640 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "" -#: src/tar.c:471 +#: src/tar.c:485 msgid "don't replace existing files when extracting, treat them as errors" msgstr "" -#: src/tar.c:474 +#: src/tar.c:488 msgid "don't replace existing files when extracting, silently skip over them" msgstr "" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:490 +#: src/tar.c:504 msgid "preserve existing symlinks to directories when extracting" msgstr "" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "" -#: src/tar.c:499 +#: src/tar.c:516 #, fuzzy msgid "extract files to standard output" msgstr "Ralat ketika menulis ke output piawai" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " "place (METHOD='system')" msgstr "" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" msgstr "" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:554 +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 msgid "Handling of extended file attributes:" msgstr "" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" msgstr "" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" msgstr "" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" msgstr "" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" msgstr "" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" msgstr "" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" msgstr "" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" msgstr "" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" msgstr "" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "" -#: src/tar.c:603 +#: src/tar.c:627 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Tak dapat menentusah arkib multi-volume" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:629 +#: src/tar.c:653 #, fuzzy msgid "Archive format selection:" msgstr "opsyen format arkib konflik" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:660 +#: src/tar.c:684 #, fuzzy msgid "Compression options:" msgstr "Opsyen mampatan konflik" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:687 -msgid "DIR" -msgstr "" - -#: src/tar.c:688 +#: src/tar.c:712 #, fuzzy msgid "change to directory DIR" msgstr "Tak dapat tukar direktori kerja" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +msgid "unquote input file or member names (default)" msgstr "" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +msgid "do not unquote input file or member names" msgstr "" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:729 +#: src/tar.c:761 #, fuzzy msgid "don't strip leading '/'s from file names" msgstr "Membuang awalan `%.*s' drpd nama ahli" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:735 +#: src/tar.c:767 msgid "begin at member MEMBER-NAME when reading the archive" msgstr "" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "" -#: src/tar.c:767 +#: src/tar.c:799 msgid "patterns match after any '/' (default for exclusion)" msgstr "" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "" -#: src/tar.c:775 +#: src/tar.c:807 #, fuzzy msgid "wildcards do not match '/'" msgstr "Volum %s tidak sepadan %s" -#: src/tar.c:777 +#: src/tar.c:809 msgid "wildcards match '/' (default for exclusion)" msgstr "" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2108,316 +2146,309 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:802 -#, fuzzy +#: src/tar.c:834 msgid "print file modification times in UTC" -msgstr "Mod tidak sah diberi pada opsyen" +msgstr "" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:978 +#: src/tar.c:1010 #, fuzzy msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" msgstr "Anda tak boleh nyatakan lebih drpd satu opsyen `-Acdtrux'" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Opsyen mampatan konflik" -#: src/tar.c:1047 +#: src/tar.c:1079 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr "jenis fail tak diketahui %s\n" -#: src/tar.c:1071 +#: src/tar.c:1103 #, fuzzy msgid "Date sample file not found" msgstr "Fail tarikh tidak dijumpai" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Mengganti %s bagi format tarikh tak diketahui %s" -#: src/tar.c:1108 +#: src/tar.c:1140 #, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 -#, fuzzy, c-format +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 +#, c-format msgid "filter the archive through %s" -msgstr "%s: fail adalah arkib; tidak dilonggokkan" +msgstr "" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1295 +#: src/tar.c:1330 #, fuzzy msgid "Invalid owner or group ID" msgstr "Pemilik tidak sah" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Faktor pemblokan tidak sah" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "panjang pita tidak sah" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Mod tidak sah diberi pada opsyen" -#: src/tar.c:1858 +#: src/tar.c:1925 #, fuzzy msgid "Invalid number" msgstr "Nombot inod tidak sah" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Saiz rekod tidak sah" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "Saiz rekod mesti dalam gandaan %d." -#: src/tar.c:1975 +#: src/tar.c:2042 #, fuzzy msgid "Invalid number of elements" msgstr "panjang pita tidak sah" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:2133 -#, fuzzy, c-format +#: src/tar.c:2205 +#, c-format msgid "Unknown density: '%c'" -msgstr "jenis fail tak diketahui %s\n" +msgstr "" -#: src/tar.c:2150 +#: src/tar.c:2222 #, fuzzy, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "Opsyen `-[0-7][lmh]' tak disokong oleh tar *ini*" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "" -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 +#, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "%s: Tak dapat rayau ke %s" + +#: src/tar.c:2389 #, fuzzy, c-format msgid "Old option '%c' requires an argument." msgstr "OPsyen lama `%c' memerlukan hujah." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2389 -#, c-format -msgid "--occurrence cannot be used with %s" -msgstr "" - -#: src/tar.c:2408 +#: src/tar.c:2490 #, fuzzy msgid "Multiple archive files require '-M' option" msgstr "Fail akrib beraneka memerlukan opsyen `-M'" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "Tak boleh gabung --listed-incremental dengan --newer" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "" -#: src/tar.c:2433 +#: src/tar.c:2515 #, fuzzy, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "%s: Label volum adalah terlalu panjang (had adalah %lu byte)" msgstr[1] "%s: Label volum adalah terlalu panjang (had adalah %lu byte)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Tak dapat menentusah arkib multi-volume" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Tak dapat menentusahkan arkib termampat" -#: src/tar.c:2450 -#, c-format -msgid "--verify cannot be used with %s" -msgstr "" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Tak dapat menggunakan arkib multi-volume termampat" -#: src/tar.c:2461 +#: src/tar.c:2543 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Tak dapat mengemaskini arkib termampat" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2478 +#: src/tar.c:2560 msgid "--acls can be used only on POSIX archives" msgstr "" -#: src/tar.c:2483 +#: src/tar.c:2565 msgid "--selinux can be used only on POSIX archives" msgstr "" -#: src/tar.c:2488 +#: src/tar.c:2570 msgid "--xattrs can be used only on POSIX archives" msgstr "" -#: src/tar.c:2493 -#, c-format -msgid "--%s option cannot be used with %s" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "Secara dayus enggan mencipta arkib kosong" -#: src/tar.c:2565 +#: src/tar.c:2669 #, fuzzy msgid "Options '-Aru' are incompatible with '-f -'" msgstr "Opsyen `-Aru' tak serasi dengan `-f -'" -#: src/tar.c:2660 +#: src/tar.c:2766 #, fuzzy msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" msgstr "Anda mesti nyatakan satu drpd opsyen `-Acdtrux'" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, fuzzy, c-format msgid "%s: File shrank by %s byte" @@ -2425,99 +2456,99 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: Fail mengecil sebanyak %s byte" msgstr[1] "%s: Fail mengecil sebanyak %s byte" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "" -#: src/xheader.c:173 +#: src/xheader.c:174 #, fuzzy msgid "Time stamp is out of allowed range" msgstr "Setem masa diluar julat" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "" -#: src/xheader.c:676 +#: src/xheader.c:677 #, fuzzy, c-format msgid "Extended header length %*s is out of range" msgstr "Rentetan %s base-64 ditandatangani arkibadalah diluar julat %s " -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "" -#: src/xheader.c:740 +#: src/xheader.c:741 #, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, fuzzy, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "Nilai %s arkib adalah dijuar julat %s %s..%s" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, fuzzy, c-format msgid "%s: not a valid timeout" msgstr "%s: Kumpulan tidak sah" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "" @@ -2525,7 +2556,7 @@ msgstr "" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, fuzzy, c-format msgid "Write checkpoint %u" msgstr "Menulis titiksemak %d" @@ -2534,7 +2565,7 @@ msgstr "Menulis titiksemak %d" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, fuzzy, c-format msgid "Read checkpoint %u" msgstr "Membaca titiksemak %d" @@ -2605,11 +2636,8 @@ msgid "Synchronous execution options:" msgstr "" #: tests/genfile.c:163 -#, fuzzy msgid "OPTION" msgstr "" -"\n" -"Pengunaan : %s [OPSYEN]...\n" #: tests/genfile.c:164 msgid "" @@ -2740,7 +2768,7 @@ msgstr "%s: Tak dapat rayau ke %s" #: tests/genfile.c:692 #, fuzzy, c-format msgid "cannot truncate `%s'" -msgstr "%s: Tak dapat rayau ke %s" +msgstr "%s: Tak dapat menukarnama ke %s" #: tests/genfile.c:701 #, fuzzy, c-format @@ -2750,7 +2778,7 @@ msgstr "Arahan '%s' gagal" #: tests/genfile.c:706 #, fuzzy, c-format msgid "cannot unlink `%s'" -msgstr "%s: Tak dapat rayau ke %s" +msgstr "%s: Tak dapat symlink ke %s" #: tests/genfile.c:833 #, c-format @@ -2787,85 +2815,12 @@ msgstr "" msgid "--stat requires file names" msgstr "Nama fail modul" -#, fuzzy -#~ msgid "Cannot get working directory" -#~ msgstr "Tak dapat tukar direktori kerja" - -#, fuzzy -#~ msgid "Invalid group" -#~ msgstr "%s: Kumpulan tidak sah" - -#, fuzzy -#~ msgid "%s: Directory removed before we read it" -#~ msgstr "%s: Fail dibuang sebelum kami membacanya" - -#, fuzzy -#~ msgid "Cannot restore working directory" -#~ msgstr "Tak dapat simpan direktori kerja" - -#, fuzzy -#~ msgid "Cannot resolve hostname %s" -#~ msgstr "%s: Tak dapat menukarnama ke %s" +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "Tak boleh gabung --listed-incremental dengan --newer" #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: opsyen salah -- %c\n" -#~ msgid "Reading %s\n" -#~ msgstr "Membaca %s\n" - -#, fuzzy -#~ msgid "" -#~ "\n" -#~ "Report bugs to <%s>.\n" -#~ msgstr "" -#~ "\n" -#~ "Lapor pepijat ke .\n" - -#, fuzzy -#~ msgid "filter the archive through compress" -#~ msgstr "%s: fail adalah arkib; tidak dilonggokkan" - -#, fuzzy -#~ msgid "filter the archive through lzma" -#~ msgstr "%s: fail adalah arkib; tidak dilonggokkan" - -#, fuzzy -#~ msgid "filter the archive through lzop" -#~ msgstr "%s: fail adalah arkib; tidak dilonggokkan" - -#~ msgid "rmtd: Cannot allocate buffer space\n" -#~ msgstr "rmtd: tak dapat memperuntukkan ruang penimbal\n" - -#~ msgid "Cannot allocate buffer space" -#~ msgstr "Tak dapat memperuntukkan ruang penimbal" - -#~ msgid "Try `%s --help' for more information.\n" -#~ msgstr "Cuba '%s --help' untuk maklumat lanjut.\n" - -#, fuzzy -#~ msgid "" -#~ "Usage: %s [OPTION]\n" -#~ "Manipulate a tape drive, accepting commands from a remote process.\n" -#~ "\n" -#~ " --version Output version info.\n" -#~ " --help Output this help.\n" -#~ msgstr "" -#~ "Penggunaan: %s [OPSYEN]\n" -#~ "Manupulasi pemacu pita, menerima arahan drpd proses jauh.\n" -#~ "\n" -#~ " --version Output maklumat versi.\n" -#~ " --help Output bantuan ini.\n" - -#, fuzzy -#~ msgid "Seek offset error" -#~ msgstr "Offset rayauan diluar julat" - -#~ msgid "Premature end of file" -#~ msgstr "Akhir fail tak matang" - -#~ msgid "Error is not recoverable: exiting now" -#~ msgstr "Ralat adalah tidak boleh dipulihkan: keluar sekarang" - #~ msgid "block size" #~ msgstr "saiz blok" @@ -2881,6 +2836,9 @@ msgstr "Nama fail modul" #~ msgid "tar (grandchild)" #~ msgstr "tar (cucu)" +#~ msgid "Reading %s\n" +#~ msgstr "Membaca %s\n" + #~ msgid "WARNING: No volume header" #~ msgstr "AMARAN: Tiada pengepala volum" @@ -2896,6 +2854,9 @@ msgstr "Nama fail modul" #~ msgid "Visible long name error" #~ msgstr "Ralat nama panjang boleh tampak" +#~ msgid "Error is not recoverable: exiting now" +#~ msgstr "Ralat adalah tidak boleh dipulihkan: keluar sekarang" + #~ msgid "Device number out of range" #~ msgstr "Nombor peranti diluar julat" @@ -2906,9 +2867,6 @@ msgstr "Nama fail modul" #~ msgid "Renamed %s to %s" #~ msgstr "%s ditukarnama ke %s" -#~ msgid "%s: Cannot symlink to %s" -#~ msgstr "%s: Tak dapat symlink ke %s" - #~ msgid "Symlinked %s to %s" #~ msgstr "%s disymlink ke %s" @@ -2919,6 +2877,12 @@ msgstr "Nama fail modul" #~ msgid "Missing file name after -C" #~ msgstr "Kehilangan nama fail selepas -C" +#~ msgid "rmtd: Cannot allocate buffer space\n" +#~ msgstr "rmtd: tak dapat memperuntukkan ruang penimbal\n" + +#~ msgid "Cannot allocate buffer space" +#~ msgstr "Tak dapat memperuntukkan ruang penimbal" + #~ msgid "" #~ "This program comes with NO WARRANTY, to the extent permitted by law.\n" #~ "You may redistribute it under the terms of the GNU General Public " @@ -2930,6 +2894,9 @@ msgstr "Nama fail modul" #~ "Anda boleh mengagihkan ia dibawah syarat Lesen Awam Umum GNU;\n" #~ "lihat fail bernama COPYING untuk maklumat lanjut" +#~ msgid "Premature end of file" +#~ msgstr "Akhir fail tak matang" + #~ msgid "rmtd: Garbage command %c\n" #~ msgstr "rmtd: Arahan Sampah %c\n" diff --git a/po/nb.gmo b/po/nb.gmo index 863407f..2cacef0 100644 Binary files a/po/nb.gmo and b/po/nb.gmo differ diff --git a/po/nb.po b/po/nb.po index 60dfb5e..e59ae4a 100644 --- a/po/nb.po +++ b/po/nb.po @@ -2,12 +2,12 @@ # Copyright (C) 1996 Free Software Foundation, Inc. # Karl Anders Øygard , 1996. # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" "Project-Id-Version: GNU tar 1.12\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" "PO-Revision-Date: 1997-06-05 19:39 MET DST\n" "Last-Translator: Espen Skjelnes Johnsen \n" "Language-Team: Norwegian-bokmål \n" @@ -98,7 +98,7 @@ msgstr "" msgid "give a short usage message" msgstr "" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "" @@ -137,9 +137,9 @@ msgid "write error" msgstr "" #: gnu/getopt.c:549 gnu/getopt.c:578 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "Gammelt flagg «%c» behøver et argument." +msgstr "" #: gnu/getopt.c:626 gnu/getopt.c:630 #, fuzzy, c-format @@ -167,9 +167,9 @@ msgid "%s: unrecognized option '%c%s'\n" msgstr "" #: gnu/getopt.c:807 gnu/getopt.c:810 -#, fuzzy, c-format +#, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "Ugyldig verdi for record_size" +msgstr "" #: gnu/getopt.c:863 gnu/getopt.c:880 gnu/getopt.c:1090 gnu/getopt.c:1108 #, fuzzy, c-format @@ -177,9 +177,9 @@ msgid "%s: option requires an argument -- '%c'\n" msgstr "Gammelt flagg «%c» behøver et argument." #: gnu/getopt.c:936 gnu/getopt.c:952 -#, fuzzy, c-format +#, c-format msgid "%s: option '-W %s' is ambiguous\n" -msgstr "Gammelt flagg «%c» behøver et argument." +msgstr "" #: gnu/getopt.c:976 gnu/getopt.c:994 #, fuzzy, c-format @@ -378,20 +378,16 @@ msgstr "" #. "Report translation bugs to <...>\n" with the address for translation #. bugs (typically your translation team's web or email address). #: gnu/version-etc.c:247 -#, fuzzy, c-format +#, c-format msgid "" "\n" "Report bugs to: %s\n" msgstr "" -"\n" -"Rapporter feil til .\n" #: gnu/version-etc.c:249 -#, fuzzy, c-format +#, c-format msgid "Report %s bugs to: %s\n" msgstr "" -"\n" -"Rapporter feil til .\n" #: gnu/version-etc.c:253 #, c-format @@ -411,65 +407,65 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, fuzzy, c-format msgid "%s: Cannot %s" -msgstr "Kan ikke eksekvere %s" +msgstr "Kan ikke utføre «stat» på filen %s" #. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'. #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, fuzzy, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: Kan ikke endre modus til %0.4o" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, fuzzy, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: Kan ikke endre eier til uid %d, gid %d" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, fuzzy, c-format msgid "%s: Cannot hard link to %s" msgstr "Kan ikke lese link %s" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, fuzzy, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "Lesefeil ved byte %ld under lesing av %d bytes i fil %s" msgstr[1] "Lesefeil ved byte %ld under lesing av %d bytes i fil %s" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, fuzzy, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" msgstr[0] "Lesefeil ved byte %ld under lesing av %d bytes i fil %s" msgstr[1] "Lesefeil ved byte %ld under lesing av %d bytes i fil %s" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, fuzzy, c-format msgid "%s: Cannot seek to %s" msgstr "Kan ikke skrive til %s" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, fuzzy, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: Kunne ikke lage symbolisk link til «%s»" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, fuzzy, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -536,9 +532,8 @@ msgid "Invalid seek direction" msgstr "Ugyldig modus gitt i flagg" #: rmt/rmt.c:446 -#, fuzzy msgid "Invalid seek offset" -msgstr "Ugyldig datoformat «%s»" +msgstr "" #: rmt/rmt.c:452 msgid "Seek offset out of range" @@ -547,7 +542,7 @@ msgstr "" #: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608 #, fuzzy msgid "Invalid byte count" -msgstr "Ugyldig eier gitt i flagg" +msgstr "Ugyldig datoformat «%s»" #: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625 msgid "Byte count out of range" @@ -561,7 +556,7 @@ msgstr "rmtd: For tidlig filslutt\n" #: rmt/rmt.c:601 #, fuzzy msgid "Invalid operation code" -msgstr "Ugyldig verdi for record_size" +msgstr "Ugyldig eier gitt i flagg" #: rmt/rmt.c:636 rmt/rmt.c:680 msgid "Operation not supported" @@ -576,8 +571,8 @@ msgstr "Uventet filslutt i msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "" @@ -585,10 +580,10 @@ msgstr "" msgid "set debug level" msgstr "" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "" @@ -610,111 +605,119 @@ msgstr "" msgid "Garbage command" msgstr "Ugyldig kommando" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Dette ser ikke ut som et tar-arkiv" # -#: src/buffer.c:521 src/buffer.c:530 +#: src/buffer.c:574 #, fuzzy -msgid "Total bytes written" +msgid "Total bytes read" msgstr "Totalt antall bytes skrevet: " # -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:576 #, fuzzy -msgid "Total bytes read" +msgid "Total bytes written" msgstr "Totalt antall bytes skrevet: " # -#: src/buffer.c:532 -#, fuzzy, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Totalt antall bytes skrevet: " -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "Ugyldig verdi for record_size" # -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Arkivnavn er ikke oppgitt" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Kan ikke verifisere stdin/stdout-arkiv" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" # -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Kan ikke oppdatere komprimerte arkiver" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "På begynnelsen av båndet, avslutter nå" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "For mange feil, avslutter" -#: src/buffer.c:893 +#: src/buffer.c:944 #, fuzzy, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Blokkstørrelse = %d enheter" msgstr[1] "Blokkstørrelse = %d enheter" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "" msgstr[1] "" -#: src/buffer.c:991 +#: src/buffer.c:1042 #, fuzzy msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "Kunne ikke gå tilbake i arkivfilen. Den kan være uleselig uten -i" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, fuzzy, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "\aGjør klar volum nummer %d for %s og trykk return: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "EOF der svar fra bruker var forventet" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "ADVARSEL: Arkivet er ufullstendig" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -726,71 +729,71 @@ msgstr "" " ! Start et shell\n" " ? Skriv denne listen\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Ikke nytt volum; avslutter.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, fuzzy, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s fortsetter ikke i dette volumet" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s fortsetter ikke i dette volumet" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, fuzzy, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s har feil størrelse (%ld != %ld + %ld)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Dette volumet kommer ute av rekkefølge" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, fuzzy, c-format msgid "Archive not labeled to match %s" msgstr "Arkivet er ikke navngitt for å passe med «%s»" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, fuzzy, c-format msgid "Volume %s does not match %s" msgstr "Volumet «%s» stemmer ikke overens med «%s»" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" -#: src/buffer.c:1866 +#: src/buffer.c:1917 #, fuzzy msgid "write did not end on a block boundary" msgstr "Arkiv %s sluttet ikke ved en blokkgrense" @@ -802,17 +805,17 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Kunne bare lese %d av %ld bytes" msgstr[1] "Kunne bare lese %d av %ld bytes" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 #, fuzzy msgid "Contents differ" msgstr "Modus er ulik" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "Uventet filslutt i arkivet" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 #, fuzzy msgid "File type differs" msgstr "Størrelse er ulik" @@ -833,7 +836,7 @@ msgstr "Gid er ulik" msgid "Mod time differs" msgstr "Modifiseringstid er ulik" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Størrelse er ulik" @@ -851,36 +854,36 @@ msgstr "Symbolsk link er ulik" msgid "Device number differs" msgstr "Enhetsnummer er endret" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Verifisering " -#: src/compare.c:471 +#: src/compare.c:473 #, fuzzy, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "Ukjent filtype «%c» for %s, diffet som en vanlig fil" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "" -#: src/compare.c:533 +#: src/compare.c:535 msgid "Archive contains transformed file names." msgstr "" -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "" -#: src/compare.c:612 +#: src/compare.c:614 #, fuzzy, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "VERIFIKASJONSFEIL: %d ukjente arkivhoder funnet" msgstr[1] "VERIFIKASJONSFEIL: %d ukjente arkivhoder funnet" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "" @@ -926,56 +929,56 @@ msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "Filen %s krympet med %d bytes, fyller ut med nuller" msgstr[1] "Filen %s krympet med %d bytes, fyller ut med nuller" -#: src/create.c:1180 +#: src/create.c:1182 #, fuzzy, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: På et annet filesystem. Ikke lagret" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 #, fuzzy msgid "contents not dumped" msgstr " (minnet lagret)" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Ukjent filtype; filen ble ignorert" -#: src/create.c:1549 +#: src/create.c:1551 #, fuzzy, c-format msgid "Missing links to %s." msgstr " link til %s\n" -#: src/create.c:1710 +#: src/create.c:1712 #, fuzzy, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: er uendret; ikke lagret" -#: src/create.c:1719 +#: src/create.c:1721 #, fuzzy, c-format msgid "%s: file is the archive; not dumped" msgstr "%s er arkivet; ikke lagret" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Hopper til neste startseksjon" @@ -1021,7 +1024,7 @@ msgstr "Fors msgid "%s: Cannot extract -- file is continued from another volume" msgstr "Kan ikke ekstrahere «%s» -- filen fortsetter fra et tidligere volum" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 #, fuzzy msgid "Unexpected long name header" msgstr "Uventet filslutt i arkivfilen" @@ -1066,251 +1069,251 @@ msgstr "%s: P msgid "%s: Directory has been renamed" msgstr "Filkatalogen %s har endret navn" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "" -#: src/incremen.c:1045 +#: src/incremen.c:1047 #, fuzzy msgid "Invalid modification time" msgstr "Ugyldig modus gitt i flagg" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" msgstr "" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Uventet filslutt i arkivfilen" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" msgstr "" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" msgstr "" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Kan ikke gå til filkatalogen %s" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Sletter %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, fuzzy, c-format msgid "%s: Cannot remove" msgstr "Kan ikke slette %s" -#: src/list.c:189 +#: src/list.c:217 #, fuzzy, c-format msgid "%s: Omitting" msgstr "Utelater %s" -#: src/list.c:206 +#: src/list.c:235 #, fuzzy, c-format msgid "block %s: ** Block of NULs **\n" msgstr "blokk %10ld: ** Blokk med NUL-er **\n" -#: src/list.c:232 +#: src/list.c:261 #, fuzzy, c-format msgid "block %s: ** End of File **\n" msgstr "blokk %10ld: ** Slutt på fil **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, fuzzy, c-format msgid "block %s: " msgstr "blokk %10ld: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" -#: src/list.c:854 +#: src/list.c:883 #, fuzzy, c-format msgid "Archive base-256 value is out of %s range" msgstr "Dette volumet kommer ute av rekkefølge" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " link til %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, fuzzy, c-format msgid " unknown file type %s\n" msgstr " ukjent filtype «%c»\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Volumhode--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, fuzzy, c-format msgid "--Continued at byte %s--\n" msgstr "--Fortsetter ved byte %ld--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Lager filkatalog:" -#: src/misc.c:721 +#: src/misc.c:726 #, fuzzy, c-format msgid "Renaming %s to %s\n" msgstr "Endret navn på %s til %s" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, fuzzy, c-format msgid "%s: Cannot rename to %s" msgstr "Kan ikke endre navn på %s til %s" -#: src/misc.c:754 +#: src/misc.c:759 #, fuzzy, c-format msgid "Renaming %s back to %s\n" msgstr "Endret navn på %s til %s" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "" @@ -1323,71 +1326,71 @@ msgstr "" msgid "%s: file list requested from %s already read from %s" msgstr "" -#: src/names.c:448 +#: src/names.c:448 src/checkpoint.c:274 #, fuzzy, c-format msgid "cannot split string '%s': %s" -msgstr "Kan ikke gjøre «stat» på %s" +msgstr "Kan ikke lage en symbolisk link fra %s til %s" #: src/names.c:490 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: Finnes ikke i arkivet" -#: src/names.c:842 +#: src/names.c:845 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Finnes ikke i arkivet" -#: src/names.c:876 +#: src/names.c:879 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "Arkivet er ikke navngitt for å passe med «%s»" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "Flaggene «-%s» and «-%s» vil begge ta standard inn" -#: src/tar.c:163 +#: src/tar.c:164 #, fuzzy, c-format msgid "%s: Invalid archive format" msgstr "Ugyldig datoformat «%s»" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "GNU-funksjoner forsøkt på inkompatibelt arkiv-format" -#: src/tar.c:255 +#: src/tar.c:264 #, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." msgstr "" -#: src/tar.c:364 +#: src/tar.c:378 msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1398,7 +1401,7 @@ msgid "" " tar -xf archive.tar # Extract all files from archive.tar.\n" msgstr "" -#: src/tar.c:373 +#: src/tar.c:387 #, fuzzy msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1422,80 +1425,80 @@ msgstr "" " ellers enkle\n" " never, simple lag enkle sikkerhetskopier\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "" -#: src/tar.c:411 +#: src/tar.c:425 #, fuzzy msgid "create a new archive" msgstr "Uventet filslutt i arkivet" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1503,617 +1506,642 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:469 +#: src/tar.c:483 #, fuzzy msgid "remove files after adding them to the archive" msgstr "Tar bort enhetsnavn fra navn i arkivet" -#: src/tar.c:471 +#: src/tar.c:485 msgid "don't replace existing files when extracting, treat them as errors" msgstr "" -#: src/tar.c:474 +#: src/tar.c:488 msgid "don't replace existing files when extracting, silently skip over them" msgstr "" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:490 +#: src/tar.c:504 msgid "preserve existing symlinks to directories when extracting" msgstr "" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " "place (METHOD='system')" msgstr "" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" msgstr "" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:554 +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 msgid "Handling of extended file attributes:" msgstr "" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" msgstr "" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" msgstr "" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" msgstr "" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" msgstr "" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" msgstr "" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" msgstr "" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" msgstr "" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" msgstr "" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "" -#: src/tar.c:603 +#: src/tar.c:627 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Kan ikke verifisere arkiv som går over flere volum" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:629 +#: src/tar.c:653 #, fuzzy msgid "Archive format selection:" msgstr "Arkivér til stdin" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:660 +#: src/tar.c:684 #, fuzzy msgid "Compression options:" msgstr "Konflikt i kompresjonsflagg" -#: src/tar.c:662 +#: src/tar.c:686 #, fuzzy msgid "use archive suffix to determine the compression program" msgstr "Kan ikke skrive til komprimeringsprogrammet" -#: src/tar.c:664 +#: src/tar.c:688 #, fuzzy msgid "do not use archive suffix to determine the compression program" msgstr "Kan ikke skrive til komprimeringsprogrammet" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:687 -msgid "DIR" -msgstr "" - -#: src/tar.c:688 +#: src/tar.c:712 #, fuzzy msgid "change to directory DIR" msgstr "Kan ikke gå til filkatalogen %s" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +msgid "unquote input file or member names (default)" msgstr "" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +msgid "do not unquote input file or member names" msgstr "" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "" # -#: src/tar.c:729 +#: src/tar.c:761 #, fuzzy msgid "don't strip leading '/'s from file names" msgstr "Tar bort ledende «/» fra absolutte linker" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:735 +#: src/tar.c:767 msgid "begin at member MEMBER-NAME when reading the archive" msgstr "" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "" -#: src/tar.c:767 +#: src/tar.c:799 msgid "patterns match after any '/' (default for exclusion)" msgstr "" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "" -#: src/tar.c:775 -#, fuzzy +#: src/tar.c:807 msgid "wildcards do not match '/'" -msgstr "Volumet «%s» stemmer ikke overens med «%s»" +msgstr "" -#: src/tar.c:777 +#: src/tar.c:809 msgid "wildcards match '/' (default for exclusion)" msgstr "" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2121,317 +2149,310 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:802 -#, fuzzy +#: src/tar.c:834 msgid "print file modification times in UTC" -msgstr "Ugyldig modus gitt i flagg" +msgstr "" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:810 +#: src/tar.c:842 #, fuzzy msgid "ask for confirmation for every action" msgstr "Kan ikke lese bekreftelse fra brukeren" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:978 +#: src/tar.c:1010 #, fuzzy msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" msgstr "Du kan ikke angi mer enn ett av «-Acdtrux»-flaggene" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Konflikt i kompresjonsflagg" -#: src/tar.c:1047 +#: src/tar.c:1079 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr "Ukjent mønster «%s»" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "" -#: src/tar.c:1108 +#: src/tar.c:1140 #, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1295 +#: src/tar.c:1330 #, fuzzy msgid "Invalid owner or group ID" msgstr "Ugyldig eier gitt i flagg" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "Mer enn én grense-dato" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Ugyldig modus gitt i flagg" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1926 +#: src/tar.c:1993 #, fuzzy msgid "Invalid record size" msgstr "Ugyldig verdi for record_size" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "Blokkstørrelse må være delbart på %d." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:2133 +#: src/tar.c:2205 #, fuzzy, c-format msgid "Unknown density: '%c'" msgstr "Ukjent mønster «%s»" -#: src/tar.c:2150 +#: src/tar.c:2222 #, fuzzy, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "Flaggene «-[0-7][lmh]» støttes ikke av *denne* implementasjonen av tar" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "" -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 +#, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "Kan ikke skrive til %s" + +#: src/tar.c:2389 #, fuzzy, c-format msgid "Old option '%c' requires an argument." msgstr "Gammelt flagg «%c» behøver et argument." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2389 -#, c-format -msgid "--occurrence cannot be used with %s" -msgstr "" - -#: src/tar.c:2408 +#: src/tar.c:2490 #, fuzzy msgid "Multiple archive files require '-M' option" msgstr "Ved flere arkivfiler behøves «-M»-flagget" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "" msgstr[1] "" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Kan ikke verifisere arkiv som går over flere volum" # -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Kan ikke verifisere komprimerte arkiver" -#: src/tar.c:2450 -#, c-format -msgid "--verify cannot be used with %s" -msgstr "" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Kan ikke bruke komprimerte arkiv som går over flere volum" # -#: src/tar.c:2461 +#: src/tar.c:2543 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Kan ikke oppdatere komprimerte arkiver" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2478 +#: src/tar.c:2560 msgid "--acls can be used only on POSIX archives" msgstr "" -#: src/tar.c:2483 +#: src/tar.c:2565 msgid "--selinux can be used only on POSIX archives" msgstr "" -#: src/tar.c:2488 +#: src/tar.c:2570 msgid "--xattrs can be used only on POSIX archives" msgstr "" -#: src/tar.c:2493 -#, c-format -msgid "--%s option cannot be used with %s" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "For feig til å lage et tomt arkiv" -#: src/tar.c:2565 +#: src/tar.c:2669 #, fuzzy msgid "Options '-Aru' are incompatible with '-f -'" msgstr "Flaggene «-Aru» er inkompatible med «-f -»" -#: src/tar.c:2660 +#: src/tar.c:2766 #, fuzzy msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" msgstr "Du må angi ett av «-Acdtrux»-flaggene" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, fuzzy, c-format msgid "%s: File shrank by %s byte" @@ -2439,98 +2460,98 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: Filen krympet med %d bytes, (øh!)" msgstr[1] "%s: Filen krympet med %d bytes, (øh!)" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" msgstr "" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "" -#: src/xheader.c:740 +#: src/xheader.c:741 #, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "" @@ -2538,7 +2559,7 @@ msgstr "" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, fuzzy, c-format msgid "Write checkpoint %u" msgstr "Skriver kontrollpunkt %d" @@ -2547,7 +2568,7 @@ msgstr "Skriver kontrollpunkt %d" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, fuzzy, c-format msgid "Read checkpoint %u" msgstr "Leser kontrollpunkt %d" @@ -2617,11 +2638,8 @@ msgid "Synchronous execution options:" msgstr "" #: tests/genfile.c:163 -#, fuzzy msgid "OPTION" msgstr "" -"\n" -"Bruk: %s [FLAGG]...\n" #: tests/genfile.c:164 msgid "" @@ -2753,7 +2771,7 @@ msgstr "Kan ikke gj #: tests/genfile.c:692 #, fuzzy, c-format msgid "cannot truncate `%s'" -msgstr "Kan ikke åpne %s" +msgstr "Kan ikke utføre «stat» på filen %s" #: tests/genfile.c:701 #, c-format @@ -2763,7 +2781,7 @@ msgstr "" #: tests/genfile.c:706 #, fuzzy, c-format msgid "cannot unlink `%s'" -msgstr "Kan ikke åpne %s" +msgstr "Kan ikke lese link %s" #: tests/genfile.c:833 #, c-format @@ -2800,49 +2818,6 @@ msgstr "" msgid "--stat requires file names" msgstr "--Ødelagte filnavn--\n" -#, fuzzy -#~ msgid "Cannot get working directory" -#~ msgstr "Kan ikke gå til filkatalogen %s" - -#, fuzzy -#~ msgid "Read error in snapshot file" -#~ msgstr "Lesefeil på %s" - -#, fuzzy -#~ msgid "Unexpected field value in snapshot file" -#~ msgstr "Uventet filslutt i arkivfilen" - -#, fuzzy -#~ msgid "Invalid group" -#~ msgstr "Ugyldig eier gitt i flagg" - -#, fuzzy -#~ msgid "%s: Directory removed before we read it" -#~ msgstr "Filkatalogen %s har endret navn" - -#, fuzzy -#~ msgid "Cannot restore working directory" -#~ msgstr "Kan ikke gå til filkatalogen %s" - -#, fuzzy -#~ msgid "Cannot resolve hostname %s" -#~ msgstr "Kan ikke endre navn på %s til %s" - -#~ msgid "Reading %s\n" -#~ msgstr "Leser %s\n" - -#~ msgid "rmtd: Cannot allocate buffer space\n" -#~ msgstr "rmtd: Kan ikke allokere buffer\n" - -#~ msgid "Cannot allocate buffer space" -#~ msgstr "Kan ikke allokere plass til buffer" - -#~ msgid "Try `%s --help' for more information.\n" -#~ msgstr "Tast «%s --help» for mer informasjon.\n" - -#~ msgid "Premature end of file" -#~ msgstr "For tidlig filslutt" - #~ msgid "Cannot close file #%d" #~ msgstr "Kan ikke lukke fil #%d" @@ -2907,6 +2882,12 @@ msgstr "-- #~ msgid "Only wrote %u of %u bytes to %s" #~ msgstr "Skrev bare %u av %u bytes til %s" +#~ msgid "Read error on %s" +#~ msgstr "Lesefeil på %s" + +#~ msgid "Reading %s\n" +#~ msgstr "Leser %s\n" + #~ msgid "WARNING: No volume header" #~ msgstr "ADVARSEL: Manglende volumhode" @@ -3031,9 +3012,6 @@ msgstr "-- #~ msgid "Visible long name error" #~ msgstr "Feil på et langt navn" -#~ msgid "Cannot stat %s" -#~ msgstr "Kan ikke utføre «stat» på filen %s" - #~ msgid "Could not get current directory: %s" #~ msgstr "Kunne ikke finne navnet på aktiv filkatalog: %s" @@ -3061,9 +3039,6 @@ msgstr "-- #~ msgid "Visible longname error" #~ msgstr "Feil på et langt navn" -#~ msgid "Cannot symlink %s to %s" -#~ msgstr "Kan ikke lage en symbolisk link fra %s til %s" - #~ msgid "Symlinked %s to %s" #~ msgstr "%s symbolsk linket til %s" @@ -3073,6 +3048,15 @@ msgstr "-- #~ msgid "Missing file name after -C" #~ msgstr "Mangler filnavn etter -C" +#~ msgid "rmtd: Cannot allocate buffer space\n" +#~ msgstr "rmtd: Kan ikke allokere buffer\n" + +#~ msgid "Cannot allocate buffer space" +#~ msgstr "Kan ikke allokere plass til buffer" + +#~ msgid "Premature end of file" +#~ msgstr "For tidlig filslutt" + #~ msgid "rmtd: Garbage command %c\n" #~ msgstr "rmtd: Ugyldig kommando %c\n" @@ -3385,6 +3369,13 @@ msgstr "-- #~ "fil eller en enhet. *Denne* versjonen av tar har «-f%s -b%d» som " #~ "forvalg.\n" +#~ msgid "" +#~ "\n" +#~ "Report bugs to .\n" +#~ msgstr "" +#~ "\n" +#~ "Rapporter feil til .\n" + #~ msgid "Obsolete option, now implied by --blocking-factor" #~ msgstr "Utdatert flagg, nå implisert av --blocking-factor" diff --git a/po/nl.gmo b/po/nl.gmo index ade0e31..271ff4d 100644 Binary files a/po/nl.gmo and b/po/nl.gmo differ diff --git a/po/nl.po b/po/nl.po index d9930e1..b4fb5e5 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,17 +1,19 @@ # Dutch translations for GNU tar. -# Copyright (C) 2011 Free Software Foundation, Inc. +# Copyright (C) 2013 Free Software Foundation, Inc. # This file is distributed under the same license as the tar package. # -# Benno Schulenberg , 2005, 2006, 2007, 2008, 2010, 2011. +# "Along the maize and through the woods." +# +# Benno Schulenberg , 2005, 2006, 2007, 2008, 2010, 2011, 2013. # Erwin Poeze , 2009. # Elros Cyriatan , 2004. -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" -"Project-Id-Version: tar-1.26\n" +"Project-Id-Version: tar-1.27\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" -"PO-Revision-Date: 2011-03-12 17:27+0100\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" +"PO-Revision-Date: 2013-10-06 21:37+0200\n" "Last-Translator: Benno Schulenberg \n" "Language-Team: Dutch \n" "Language: nl\n" @@ -81,7 +83,7 @@ msgid " [OPTION...]" msgstr " [OPTIE...]" #: gnu/argp-help.c:1686 -#, fuzzy, c-format +#, c-format msgid "Try '%s --help' or '%s --usage' for more information.\n" msgstr "Typ '%s --help' of '%s --usage' voor meer informatie.\n" @@ -104,7 +106,7 @@ msgstr "deze hulptekst tonen" msgid "give a short usage message" msgstr "een korte gebruikssamenvatting tonen" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "NAAM" @@ -143,9 +145,9 @@ msgid "write error" msgstr "schrijffout" #: gnu/getopt.c:549 gnu/getopt.c:578 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: optie '%s' is niet eenduidig\n" +msgstr "%s: optie '%s' is niet eenduidig; mogelijkheden zijn:" #: gnu/getopt.c:626 gnu/getopt.c:630 #, c-format @@ -442,7 +444,7 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: Functie %s() is mislukt" @@ -451,56 +453,56 @@ msgstr "%s: Functie %s() is mislukt" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: Waarschuwing: functie %s() is mislukt" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: Kan modus niet wijzigen naar %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: Kan eigenaar niet wijzigen naar UID %lu, GID %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "Kan geen harde koppeling maken van %s naar %s" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Leesfout op byte %s, tijdens lezen van %lu byte" msgstr[1] "%s: Leesfout op byte %s, tijdens lezen van %lu bytes" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Waarschuwing: leesfout op byte %s, tijdens lezen van %lu byte" msgstr[1] "%s: Waarschuwing: leesfout op byte %s, tijdens lezen van %lu bytes" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: Kan in bestand niet naar %s springen" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: Waarschuwing: kan in bestand niet naar %s springen" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "Kan geen symbolische koppeling maken van %s naar %s" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -546,9 +548,9 @@ msgid "Cannot connect to %s: resolve failed" msgstr "Kan geen verbinding maken met %s: herleiding is mislukt" #: lib/rtapelib.c:502 -#, fuzzy, c-format +#, c-format msgid "Cannot redirect files for remote shell" -msgstr "Kan gindse shell niet uitvoeren" +msgstr "Kan geen bestanden omleiden voor shell op afstand" #: lib/rtapelib.c:516 #, c-format @@ -600,8 +602,8 @@ msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "" "Een magneetband manipuleren, en opdrachten accepteren van een ander proces." -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "AANTAL" @@ -609,10 +611,10 @@ msgstr "AANTAL" msgid "set debug level" msgstr "debug-niveau instellen" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "BESTAND" @@ -634,104 +636,112 @@ msgstr "te veel argumenten" msgid "Garbage command" msgstr "Ongeldige opdracht" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Dit ziet er niet uit als een tar-archief" -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" -msgstr "Totaal aantal geschreven bytes" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" msgstr "Totaal aantal gelezen bytes" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "Totaal aantal geschreven bytes" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Totaal aantal verwijderde bytes: %s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(pijp)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "Ongeldige waarde voor recordgrootte" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Geen archiefnaam opgegeven" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Kan archieven op standaardinvoer of -uitvoer niet verifiëren" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Archief is gecomprimeerd. Gebruik optie '%s'." -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Kan ingepakte archieven niet bijwerken" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "Aan het begin van de band -- tar sluit nu af." -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "Te veel fouten -- tar sluit nu af." -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Recordgrootte = %lu blok" msgstr[1] "Recordgrootte = %lu blokken" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "Niet-uitgelijnd blok (%lu byte) in archief" msgstr[1] "Niet-uitgelijnd blok (%lu bytes) in archief" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" "Kan niet terugzoeken in archiefbestand; het kan onleesbaar zijn zonder -i" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek() is niet gestopt op een recordgrens" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: bevat een ongeldig deelnummer" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "Deelnummer-overloop" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Zet deel #%d voor %s klaar en druk op Enter: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "een lege tekst, terwijl gebruikersinvoer werd verwacht" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "WAARSCHUWING: Archief is onvolledig" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -743,65 +753,65 @@ msgstr "" " q tar afbreken\n" " y of Enter doorgaan\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! een subshell starten\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? dit lijstje tonen\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Geen nieuw deel -- tar sluit af.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "Geen bestandsnaam opgegeven. Probeer het nog eens.\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Ongeldige invoer. Typ ? voor hulp.\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "Opdracht %s is mislukt" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s gaat mogelijk verder in dit deel: de kop bevat een afgekapte naam" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s gaat niet verder in dit deel" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s heeft een verkeerde grootte (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Dit deel valt buiten de reeks (%s - %s != %s)" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "Archief bevat geen label, kan niet overeenkomen met %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "Deel %s komt niet overeen met %s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -809,7 +819,7 @@ msgstr "" "%s: bestandsnaam is te lang om opgeslagen te worden in een GNU-meerdelenkop; " "afgekapt" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "schrijven is niet gestopt op een recordgrens" @@ -820,16 +830,16 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Kon slechts %lu van %lu byte lezen" msgstr[1] "Kon slechts %lu van %lu bytes lezen" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "Inhouden verschillen" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "Onverwacht einde-van-bestand in archief" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "Bestandssoort verschilt" @@ -849,7 +859,7 @@ msgstr "GID verschilt" msgid "Mod time differs" msgstr "Wijzigingstijd verschilt" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Grootte verschilt" @@ -866,36 +876,36 @@ msgstr "Symbolische koppeling verschilt" msgid "Device number differs" msgstr "Apparaatnummer verschilt" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Verifiëren " -#: src/compare.c:471 -#, fuzzy, c-format +#: src/compare.c:473 +#, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "%s: Onbekende bestandssoort '%c'; gedifft als gewoon bestand" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "Archief bevat bestandsnamen waarvan de prefixen verwijderd zijn." -#: src/compare.c:533 +#: src/compare.c:535 msgid "Archive contains transformed file names." msgstr "Archief bevat getransformeerde bestandsnamen." -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "Een verificatie kan mogelijk de originele bestanden niet vinden." -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "Verificatie is MISLUKT: %d ongeldige kop gevonden" msgstr[1] "Verificatie is MISLUKT: %d ongeldige koppen gevonden" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "Een los blok met nullen op %s" @@ -942,55 +952,55 @@ msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "%s: Bestand is gekrompen met %s byte; aangevuld met nullen" msgstr[1] "%s: Bestand is gekrompen met %s bytes; aangevuld met nullen" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: bestand staat op een ander bestandssysteem; niet gearchiveerd" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "inhoud niet gearchiveerd" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Onbekende bestandssoort; bestand genegeerd" -#: src/create.c:1549 +#: src/create.c:1551 #, c-format msgid "Missing links to %s." msgstr "Ontbrekende koppelingen naar %s." -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: bestand is ongewijzigd; niet gearchiveerd" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: bestand is het archief zelf; niet gearchiveerd" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "map is niet gearchiveerd" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: bestand is gewijzigd tijdens het lezen" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: socket genegeerd" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: deur genegeerd" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Alles tot aan volgende kop wordt overgeslagen" @@ -1016,7 +1026,7 @@ msgstr "%s: Onverwachte inconsistentie tijdens aanmaken van map" #: src/extract.c:705 #, c-format msgid "%s: skipping existing file" -msgstr "" +msgstr "%s: bestaand bestand wordt overgeslagen" #: src/extract.c:821 #, c-format @@ -1037,12 +1047,12 @@ msgstr "" msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Kan niet uitpakken -- bestand gaat door vanuit een ander deel" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" msgstr "Onverwachte langenaamkop" #: src/extract.c:1542 -#, fuzzy, c-format +#, c-format msgid "%s: Unknown file type '%c', extracted as normal file" msgstr "%s: Onbekende bestandssoort '%c'; uitgepakt als gewoon bestand" @@ -1072,7 +1082,7 @@ msgid "%s: Directory is new" msgstr "%s: Map is nieuw" #: src/incremen.c:566 -#, fuzzy, c-format +#, c-format msgid "%s: directory is on a different filesystem; not dumped" msgstr "%s: bestand staat op een ander bestandssysteem; niet gearchiveerd" @@ -1081,157 +1091,158 @@ msgstr "%s: bestand staat op een ander bestandssysteem; niet gearchiveerd" msgid "%s: Directory has been renamed" msgstr "%s: Map is hernoemd" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "Ongeldig tijdsstempel" -#: src/incremen.c:1045 -#, fuzzy +#: src/incremen.c:1047 msgid "Invalid modification time" -msgstr "Ongeldige wijzigingstijd (seconden)" +msgstr "Ongeldige wijzigingstijd" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "Ongeldige wijzigingstijd (nanoseconden)" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "Ongeldig apparaatnummer" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Ongeldig inode-nummer" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" -msgstr "" +msgstr "%s: byte %s: %s %.*s... te lang" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" msgstr "Onverwacht einde-van-bestand in snapshot-bestand" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" -msgstr "" +msgstr "%s: byte %s: %s %s wordt gevolgd door ongeldige byte 0x%02x" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" +"%s: byte %s: (ongeldig bereik %s..%s)\n" +" %s %s" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" -msgstr "" +msgstr "%s: byte %s: %s %s" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" -msgstr "" +msgstr "%s: byte %s: %s" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "Ontbrekende record-afsluiting" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "Onjuiste incrementele bestandsindeling" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "" "Niet-ondersteunde versie (%) van incrementele bestandsindeling" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Onjuiste archiveringsmap: '%c' werd verwacht maar %#3o gevonden" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Onjuiste archiveringsmap: 'X' staat er dubbel" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Onjuiste archiveringsmap: lege naam in 'R'" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Onjuiste archiveringsmap: 'T' werd niet voorafgegaan door 'R'" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Onjuiste archiveringsmap: lege naam in 'T'" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" "Onjuiste archiveringsmap: '%c' werd verwacht, maar de gegevens houden op" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "Onjuiste archiveringsmap: 'X' is nergens gebruikt" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Kan met sjabloon %s geen tijdelijke map aanmaken" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Map wordt niet leeggemaakt: kan de status ervan niet bepalen" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: Map staat op een ander bestandssysteem; niet leeggemaakt" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Verwijderen van %s...\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: Kan niet verwijderen" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: Overgeslagen" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "blok %s: ** Blok van NUL-tekens **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Einde-van-bestand **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Witruimte in kop waar numerieke waarde voor %s werd verwacht" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1239,124 +1250,123 @@ msgstr "" "aangenomen" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Octaalwaarde %.*s in archief valt buiten bereik voor %s" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "Archief bevat ouderwetse grondtal-64 koppen" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Tekenreeks %s (met grondtal-64-met-teken) valt buiten bereik voor %s" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Grondtal-256 waarde in archief valt buiten bereik voor %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Archief bevat %.*s waar numerieke waarde voor %s werd verwacht" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Waarde %s in archief valt buiten bereik voor %s (%s..%s)" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " koppeling naar %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " onbekende bestandssoort %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--Lange koppeling--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--Lange naam--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Deelkop--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Verder bij byte %s--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Aanmaken van map:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "Hernoemen van %s naar %s...\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "Kan %s niet naar %s hernoemen" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "Hernoemen van %s terug naar %s...\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Bestand werd verwijderd voordat het gelezen kon worden" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "dochterproces" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "interproces-kanaal" #: src/names.c:360 -#, fuzzy msgid "command line" -msgstr "Opdracht %s is mislukt" +msgstr "opdrachtregel" #: src/names.c:378 -#, fuzzy, c-format +#, c-format msgid "%s: file list requested from %s already read from %s" -msgstr "%s: bestandenlijst is al gelezen" +msgstr "%s: verzochte bestandenlijst uit %s is al gelezen uit %s" -#: src/names.c:448 -#, fuzzy, c-format +#: src/names.c:448 src/checkpoint.c:274 +#, c-format msgid "cannot split string '%s': %s" -msgstr "Kan tijdsstempel van '%s' niet zetten" +msgstr "kan tekenreeks '%s' niet splitsen: %s" #: src/names.c:490 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: gelezen bestandsnaam bevat een NUL-teken" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "Bestandsnamen bevatten jokertekens." -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1364,55 +1374,54 @@ msgstr "" "Gebruik '--wildcards' om patroonovereenkomsten in te schakelen,\n" "of '--no-wildcards' om deze waarschuwing te onderdrukken." -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: Komt niet voor in archief" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Is vereist maar komt niet voor in archief" -#: src/names.c:876 +#: src/names.c:879 #, c-format msgid "Archive label mismatch" msgstr "Archieflabel komt niet overeen" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "Met '--listed-incremental' is '-C' niet toegestaan binnen een bestandenlijst" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Met '--listed-incremental' is slechts één '-C' toegestaan" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "Opties '-%s' en '-%s' willen beide standaardinvoer gebruiken" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s: Ongeldige archiefindeling" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "GNU-functies gevraagd bij een incompatibele archiefindeling" -#: src/tar.c:255 -#, fuzzy, c-format +#: src/tar.c:264 +#, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." msgstr "" "Onbekende aanhalingsstijl '%s'. Probeer '%s --quoting-style=help' voor een " "overzicht." -#: src/tar.c:364 -#, fuzzy +#: src/tar.c:378 msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1432,8 +1441,7 @@ msgstr "" " tar -tvf archief.tar # Alle bestanden in archief.tar opsommen.\n" " tar -xf archief.tar # Alle bestanden van archief.tar uitpakken.\n" -#: src/tar.c:373 -#, fuzzy +#: src/tar.c:387 msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" "The version control may be set with --backup or VERSION_CONTROL, values " @@ -1454,80 +1462,80 @@ msgstr "" " nil, existing genummerd als ze al bestaan, anders simpel\n" " never, simple altijd simpele reservekopieën maken\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "Hoofdbewerkingen:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "de inhoud van een archief opsommen" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "bestanden uit een archief uitpakken" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "een nieuw archief aanmaken" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "verschillen tussen archief en bestandssyteem vinden" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "bestanden aan het eind van een archief toevoegen" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "" "alleen bestanden toevoegen die nieuwer zijn dan hun versie in het archief" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "tar-bestanden aan een archief toevoegen" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "uit het archief verwijderen (niet gebruiken bij magneetbanden!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "label van archiefdeel controleren en stoppen" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "Werkingsaanpassers:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "luchtige bestanden efficiënt verwerken" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "HOOFD[.SUB]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "versie van te gebruiken luchtige indeling (impliceert '--sparse')" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "oude GNU-indeling van incrementeel archief verwerken" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "nieuwe GNU-indeling van incrementeel archief verwerken" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "dump-niveau voor aan te maken incrementeel archief" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "niet afsluiten met een foutcode bij onleesbare bestanden" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1539,139 +1547,147 @@ msgstr "" "diff, --extract of --list, en wanneer een lijst van bestanden gegeven is op " "de opdrachtregel of via de optie -T; AANTAL is standaard 1" -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "in archief kan worden gesprongen" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "in archief kan niet worden gesprongen" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "" "geen apparaatnummers controleren tijdens aanmaken van incrementele archieven" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" "apparaatnummers controleren tijdens aanmaken van incrementele archieven " "(standaard)" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "Overschrijvingsopties:" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "het archief na het schrijven proberen te verifiëren" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "bestanden na hun toevoeging aan het archief verwijderen" -#: src/tar.c:471 -#, fuzzy +#: src/tar.c:485 msgid "don't replace existing files when extracting, treat them as errors" -msgstr "bij het uitpakken bestaande bestanden niet vervangen" +msgstr "" +"bij het uitpakken bestaande bestanden niet vervangen; behandelen als fouten" -#: src/tar.c:474 -#, fuzzy +#: src/tar.c:488 msgid "don't replace existing files when extracting, silently skip over them" -msgstr "bij het uitpakken bestaande bestanden niet vervangen" +msgstr "" +"bij het uitpakken bestaande bestanden niet vervangen; stilletjes overslaan" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "" "bestaande bestanden die nieuwer zijn dan die in het archief niet vervangen" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "bestaande bestanden bij het uitpakken overschrijven" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "elk bestand verwijderen alvorens eroverheen uit te pakken" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "bestaande mappen leegmaken alvorens eroverheen uit te pakken" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "metagegevens van bestaande mappen behouden" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "de metagegevens van bestaande mappen bij het uitpakken overschrijven " "(standaard)" -#: src/tar.c:490 -#, fuzzy +#: src/tar.c:504 msgid "preserve existing symlinks to directories when extracting" -msgstr "bestaande bestanden bij het uitpakken overschrijven" +msgstr "" +"bestaande symbolische koppelingen naar mappen behouden bij het uitpakken" + +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "MAP" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" -#: src/tar.c:496 +#: src/tar.c:513 msgid "Select output stream:" msgstr "Selecteren van uitvoerkanaal:" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "bestanden uitpakken naar standaarduitvoer" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "OPDRACHT" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "uitgepakte bestanden via pijp naar gegeven programma sluizen" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "afsluitwaardes van dochterprocessen negeren" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "" "afsluitwaardes van dochterprocessen die niet nul zijn als fout behandelen" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Behandeling van bestandskenmerken:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "toegevoegde bestanden krijgen NAAM als eigenaar" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "toegevoegde bestanden krijgen NAAM als groep" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "DATUM-OF-BESTAND" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" "wijzigingstijd zetten van bestanden die wegens DATUM-OF-BESTAND zijn " "toegevoegd" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "WIJZIGINGEN" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "toegevoegde bestanden krijgen (symbolische) WIJZIGINGEN in hun modus" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "MANIER" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " @@ -1681,11 +1697,11 @@ msgstr "" "herstellen van de tijdsstempels na het lezen (MANIER='replace'; standaard), " "of door de tijdsstempels met rust te laten (MANIER='system')" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "bestandswijzigingstijden niet uitpakken" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" @@ -1693,19 +1709,19 @@ msgstr "" "bestanden proberen uit te pakken met dezelfde eigenaar als in het archief " "(standaard voor root)" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "bestanden uitpakken als uzelf (standaard voor gewone gebruikers)" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "altijd getallen gebruiken voor gebruikers- en groepsnamen" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "bestandspermissies ook uitpakken (standaard voor root)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1713,16 +1729,17 @@ msgstr "" "de umask van de gebruiker toepassen bij het uitpakken van bestandspermissies " "(standaard voor gewone gebruikers)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" +"lid-argumenten worden getoond in de volgorde die ze hebben in het archief" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" -msgstr "hetzelfde als -p en -s samen" +msgstr "hetzelfde als '-p' en '-s' samen" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1730,180 +1747,187 @@ msgstr "" "het zetten van permissies en tijdsstempels van mappen uitstellen tot na het " "uitpakken" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "het effect van de optie --delay-directory-restore ongedaan maken" -#: src/tar.c:554 -#, fuzzy +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 msgid "Handling of extended file attributes:" -msgstr "Behandeling van bestandskenmerken:" +msgstr "Behandeling van uitgebreide bestandskenmerken:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" -msgstr "" +msgstr "Ondersteuning voor uitgebreide kenmerken inschakelen" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" -msgstr "" +msgstr "Ondersteuning voor uitgebreide kenmerken uitschakelen" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" -msgstr "" +msgstr "MASKER" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" -msgstr "" +msgstr "patroon van in te sluiten xattr-sleutels" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" -msgstr "" +msgstr "patroon van uit te sluiten xattr-sleutels" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" -msgstr "" +msgstr "Ondersteuning voor SELinux-contexten inschakelen" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" -msgstr "" +msgstr "Ondersteuning voor SELinux-contexten uitschakelen" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" -msgstr "" +msgstr "Ondersteuning voor POSIX ACL's inschakelen" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" -msgstr "" +msgstr "Ondersteuning voor POSIX ACL's uitschakelen" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "Apparaatselectie en -wisseling:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ARCHIEF" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "archiefbestand of apparaat ARCHIEF gebruiken" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "archiefbestand is lokaal, zelfs als het een dubbele punt bevat" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "deze OPDRACHT gebruiken in plaats van 'rmt'" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "deze OPDRACHT gebruiken in plaats van 'rsh'" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "schijf en dichtheid opgeven" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "meerdelig archief aanmaken/opsommen/uitpakken" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "band wisselen na schrijven van AANTAL x 1024 bytes" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "script uitvoeren aan einde van elke band (impliceert '-M')" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "het deelnummer in BESTAND gebruiken/bijwerken" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "Blokverwerking:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "BLOKKEN" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "BLOKKEN x 512 bytes per record" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "AANTAL bytes per record (een veelvoud van 512)" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "blokken met nullen in archief negeren (betekenen einde-van-bestand)" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "doorgaan met lezen tot blok compleet is (voor 4.2BSD-pijpen)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "Archiefindelingskeuze:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "INDELING" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "een archief maken in de gekozen indeling" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "INDELING is een van de volgende:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "oude V7 tar-indeling" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "GNU-indeling van tar <= 1.12" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "GNU-indeling van tar 1.13.x" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar-indeling)" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax-indeling)" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "hetzelfde als pax" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "hetzelfde als --format=v7" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "hetzelfde als --format=posix" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "sleutelwoord[[:]=waarde][,sleutelwoord[[:]=waarde]]..." -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "het aangeven van pax-sleutelwoorden" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "TEKST" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1911,78 +1935,76 @@ msgstr "" "een archief met deelnaam TEKST maken; bij opsommen/uitpakken TEKST als " "zoekpatroon voor de deelnaam gebruiken" -#: src/tar.c:660 +#: src/tar.c:684 msgid "Compression options:" msgstr "Compressie-opties:" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "compressieprogramma afleiden uit bestandsachtervoegsel" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "compressieprogramma niet afleiden uit bestandsachtervoegsel" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "PROGRAMMA" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "het archief door dit programma filteren (moet '-d' accepteren)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "Lokale bestandskeuze:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" "het gegeven BESTAND aan het archief toevoegen (handig als de naam begint met " "een '-')" -#: src/tar.c:687 -msgid "DIR" -msgstr "MAP" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "naar MAP gaan" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "namen van in of uit te pakken bestanden uit BESTAND halen" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "'-T' leest met NUL afgesloten namen, schakelt '-C' uit" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "het resultaat van de vorige '--null'-optie ongedaan maken" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" msgstr "" "aanhalingstekens verwijderen rond bestandsnamen gelezen met '-T' (standaard)" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" msgstr "aanhalingstekens niet verwijderen rond bestandsnamen gelezen met '-T'" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "PATROON" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "bestanden uitsluiten, gegeven als een PATROON" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "uitsluitingspatronen staan opgesomd in BESTAND" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1990,97 +2012,109 @@ msgstr "" "inhoud van mappen die CACHEDIR.TAG bevatten uitsluiten, behalve CACHEDIR.TAG " "zelf" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "alles onder mappen die CACHEDIR.TAG bevatten uitsluiten" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "mappen die CACHEDIR.TAG bevatten uitsluiten" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" "inhoud van mappen die BESTAND bevatten uitsluiten, behalve BESTAND zelf" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "alles onder mappen die BESTAND bevatten uitsluiten" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "mappen die BESTAND bevatten uitsluiten" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "systeemmappen van versiebeheer uitsluiten" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "reservekopieën en vergrendelingsbestanden uitsluiten" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "niet automatisch afdalen in mappen" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "in het lokale bestandssysteem blijven bij maken van archief" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "recursief in mappen afdalen (standaard)" -#: src/tar.c:729 -#, fuzzy +#: src/tar.c:761 msgid "don't strip leading '/'s from file names" msgstr "leidende '/' niet uit bestandsnamen verwijderen" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "" "symbolische koppelingen volgen; de bestanden waar ze naar verwijzen " "archiveren" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "" "harde koppelingen volgen; de bestanden waar ze naar verwijzen archiveren" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "LIDNAAM" -#: src/tar.c:735 -#, fuzzy +#: src/tar.c:767 msgid "begin at member MEMBER-NAME when reading the archive" -msgstr "beginnen bij lid LIDNAAM in het archief" +msgstr "beginnen bij lid LIDNAAM tijdens lezen van het archief" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "alleen bestanden opslaan die nieuwer zijn dan DATUM-OF-BESTAND" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "DATUM" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "datum en tijd alleen vergelijken wanneer gegevens veranderd zijn" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "MANIER" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "voor verwijdering een reservekopie maken, op de aangegeven MANIER" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "TEKENREEKS" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -2089,101 +2123,98 @@ msgstr "" "(in plaats van '~', die standaard is tenzij door omgevingsvariable " "SIMPLE_BACKUP_SUFFIX veranderd)" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "Bestandsnaam-transformaties:" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "dit AANTAL leidende componenten uit bestandsnamen verwijderen" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "EXPRESSIE" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "" "deze vervangings-EXPRESSIE gebruiken om bestandsnamen met 'sed' te " "transformeren" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "Bestandsnaamselectie-opties (voor zowel in- als uitsluitingspatronen):" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "verschil tussen hoofd- en kleine letters negeren" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "patronen komen overeen met begin van bestandsnaam" -#: src/tar.c:767 -#, fuzzy +#: src/tar.c:799 msgid "patterns match after any '/' (default for exclusion)" msgstr "" "patronen komen overeen met alles na een '/' (is standaard bij uitsluiting)" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "hoofdlettergevoelige vergelijking (standaard)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "jokertekens gebruiken (is standaard bij uitsluiting)" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "exacte tekenreeksvergelijking" -#: src/tar.c:775 -#, fuzzy +#: src/tar.c:807 msgid "wildcards do not match '/'" msgstr "jokertekens komen niet overeen met '/'" -#: src/tar.c:777 -#, fuzzy +#: src/tar.c:809 msgid "wildcards match '/' (default for exclusion)" msgstr "jokertekens komen overeen met '/' (is standaard bij uitsluiting)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Informatieve uitvoer:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "de verwerkte bestanden opsommen" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "SLEUTELWOORD" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "waarschuwingsbeleid" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "voortgangsberichten tonen voor elk AANTALste record (standaard 10)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "ACTIE" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "bij elk controlepunt deze ACTIE uitvoeren" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "een bericht tonen als niet alle links gearchiveerd werden" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "SIGNAAL" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2195,35 +2226,35 @@ msgstr "" "ontvangen wordt; mogelijke signalen zijn: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 " "en SIGUSR2; de namen zonder het voorvoegsel SIG worden ook geaccepteerd" -#: src/tar.c:802 +#: src/tar.c:834 msgid "print file modification times in UTC" msgstr "bestandswijzigingstijden in UTC tonen" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "bestandstijden in volledige resolutie tonen" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "gedetailleerde uitvoer naar BESTAND sturen" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "bloknummer binnen archief tonen bij elk bericht" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "bij elke actie om toestemming vragen" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "standaardinstellingen van 'tar' tonen" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" -msgstr "" +msgstr "geldige bereiken tonen voor snapshot-velden" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2231,33 +2262,33 @@ msgstr "" "bij opsommen of uitpakken: elke map opsommen die niet aan zoekcriteria " "voldoet" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "bestands- of archiefnamen na transformatie tonen" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "STIJL" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "" "aanhalingsstijl voor namen instellen (zie verderop voor geldige waarden van " "STIJL)" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "ook de tekens in TEKENREEKS aanhalen" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "de tekens in TEKENREEKS niet aanhalen" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "Compatibiliteitsopties:" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2265,56 +2296,57 @@ msgstr "" "bij aanmaken hetzelfde als --old-archive; bij uitpakken hetzelfde als --no-" "same-owner" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "Andere opties:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "" "het gebruik van potentieel gevaarlijke opties of opdrachten uitschakelen" -#: src/tar.c:978 -#, fuzzy +#: src/tar.c:1010 msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" -msgstr "Slechts één van de opties '-Acdtrux' of '--test-label' is mogelijk" +msgstr "" +"Slechts één van de opties '-Acdtrux', '--delete', of '--test-label' is " +"mogelijk" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Conflicterende compressie-opties" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "Onbekende signaalnaam: %s" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "Voorbeeldbestand voor tijdsstempel niet gevonden" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Onbekende datumopmaak %2$s wordt vervangen door %1$s" -#: src/tar.c:1108 -#, fuzzy, c-format +#: src/tar.c:1140 +#, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "Optie %s: datum '%s' wordt begrepen als %s" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "het archief door '%s' filteren" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "Geldige argumenten van de optie '--quoting-style' zijn:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2322,48 +2354,47 @@ msgstr "" "\n" "*Deze* tar gebruikt de volgende standaardwaarden:\n" -#: src/tar.c:1295 -#, fuzzy +#: src/tar.c:1330 msgid "Invalid owner or group ID" -msgstr "Ongeldige eigenaar" +msgstr "Ongeldige eigenaar of groeps-ID" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Ongeldige blokkenfactor" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "Ongeldige bandlengte" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "Onjuiste waarde van incrementeel niveau" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "Meerdere drempeldata" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "Ongeldig versienummer voor luchtige indeling" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' is op dit platform niet mogelijk" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "Waarde van '--checkpoint' is geen geheel getal" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Ongeldige modus gegeven bij optie" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "Ongeldig nummer" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" @@ -2371,150 +2402,139 @@ msgstr "" "De optie '--preserve' is vervallen; gebruik nu '--preserve-permissions --" "preserve-order'." -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Ongeldige recordgrootte" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "Recordgrootte moet een veelvoud zijn van %d." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "Ongeldig aantal elementen" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "Slechts één optie '--to-command' is toegestaan" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "Ongeldig dichtheidsargument: %s" -#: src/tar.c:2133 -#, fuzzy, c-format +#: src/tar.c:2205 +#, c-format msgid "Unknown density: '%c'" msgstr "Onbekende dichtheid: '%c'" -#: src/tar.c:2150 -#, fuzzy, c-format +#: src/tar.c:2222 +#, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "Opties '-[0-7][lmh]' worden niet ondersteund door *deze* tar" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[BESTAND]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 #, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "Optie '--%s' kan niet gebruikt worden met '%s'" + +#: src/tar.c:2389 +#, c-format msgid "Old option '%c' requires an argument." msgstr "Oude optie '%c' vereist een argument." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "Optie '--occurrence' betekent niets zonder een bestandenlijst" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "" -"Optie '--occurrence' kan niet worden gebruikt in de gevraagde werkingsmodus" - -#: src/tar.c:2408 -#, fuzzy +#: src/tar.c:2490 msgid "Multiple archive files require '-M' option" msgstr "Voor meerdere archiefbestanden is de optie '-M' vereist" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "Opties '--listed-incremental' en '--newer' gaan niet samen" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "Optie '--level' is betekenisloos zonder '--listed-incremental'" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "%s: Deellabel is te lang (grens is %lu byte)" msgstr[1] "%s: Deellabel is te lang (grens is %lu bytes)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Kan meerdelige archieven niet verifiëren" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Kan ingepakte archieven niet verifiëren" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "Patroon %s kan niet worden gebruikt" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Kan geen meerdelige ingepakte archieven verwerken" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "Kan ingepakte archieven niet samenvoegen" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "Optie '--pax' kan alleen worden gebruikt bij POSIX-archieven" -#: src/tar.c:2478 -#, fuzzy +#: src/tar.c:2560 msgid "--acls can be used only on POSIX archives" -msgstr "Optie '--pax' kan alleen worden gebruikt bij POSIX-archieven" +msgstr "Optie '--acls' kan alleen worden gebruikt bij POSIX-archieven" -#: src/tar.c:2483 -#, fuzzy +#: src/tar.c:2565 msgid "--selinux can be used only on POSIX archives" -msgstr "Optie '--pax' kan alleen worden gebruikt bij POSIX-archieven" +msgstr "Optie '--selinux' kan alleen worden gebruikt bij POSIX-archieven" -#: src/tar.c:2488 -#, fuzzy +#: src/tar.c:2570 msgid "--xattrs can be used only on POSIX archives" -msgstr "Optie '--pax' kan alleen worden gebruikt bij POSIX-archieven" +msgstr "Optie '--xattrs' kan alleen worden gebruikt bij POSIX-archieven" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "Patroon %s kan niet worden gebruikt" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" +msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "Deellengte kan niet kleiner zijn dan de recordgrootte" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "Opties '--preserve-order' en '--listed-incremental' gaan niet samen" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "Een geheel leeg archief wordt niet aangemaakt" -#: src/tar.c:2565 -#, fuzzy +#: src/tar.c:2669 msgid "Options '-Aru' are incompatible with '-f -'" msgstr "Opties '-Aru' gaan niet samen met '-f -'" -#: src/tar.c:2660 -#, fuzzy +#: src/tar.c:2766 msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" -msgstr "U dient een van de opties '-Acdtrux' of '--test-label' op te geven" +msgstr "" +"U dient een van de opties '-Acdtrux', '--delete', of '--test-label' op te " +"geven" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "Gestopt in fouttoestand vanwege eerdere fouten" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" @@ -2522,52 +2542,52 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: Bestand is gekrompen met %s byte" msgstr[1] "%s: Bestand is gekrompen met %s bytes" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "Sleutelwoord %s is onbekend of nog niet geïmplementeerd" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" msgstr "Tijdsstempel valt buiten toegestaan bereik" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "Patroon %s kan niet worden gebruikt" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Sleutelwoord %s kan niet worden overstegen" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "Onjuiste uitgebreide kop: ontbrekende lengte" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "Lengte %*s van uitgebreide kop valt buiten bereik" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "Onjuiste uitgebreide kop: ontbrekende witruimte na de lengte" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "Onjuiste uitgebreide kop: ontbrekend isgelijkteken" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "Onjuiste uitgebreide kop: ontbrekend regeleinde" -#: src/xheader.c:740 -#, fuzzy, c-format +#: src/xheader.c:741 +#, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "Genegeerd: onbekend sleutelwoord '%s' in uitgebreide kop" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" @@ -2576,47 +2596,47 @@ msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "" "Waarde %2$s in uitgebreide kop valt buiten bereik voor %1$s (%3$s..%4$s)" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Onjuiste uitgebreide kop: ongeldige %s=%s" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Onjuiste uitgebreide kop: overtollige %s=%s" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "Onjuiste uitgebreide kop: ongeldige %s: onverwacht scheidingsteken %c" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "Onjuiste uitgebreide kop: ongeldige %s: oneven aantal waarden" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "%s: ongeldige tijdswaarde" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "%s: onbekende actie voor controlepunt" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "schrijven" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "lezen" @@ -2624,7 +2644,7 @@ msgstr "lezen" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "Schrijfcontrolepunt %u" @@ -2633,7 +2653,7 @@ msgstr "Schrijfcontrolepunt %u" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "Leescontrolepunt %u" @@ -2851,12 +2871,12 @@ msgid "cannot set time on `%s'" msgstr "Kan tijdsstempel van '%s' niet zetten" #: tests/genfile.c:692 -#, fuzzy, c-format +#, c-format msgid "cannot truncate `%s'" -msgstr "Kan '%s' niet verwijderen" +msgstr "Kan '%s' niet afkappen" #: tests/genfile.c:701 -#, fuzzy, c-format +#, c-format msgid "command failed: %s" msgstr "Opdracht %s is mislukt" @@ -2900,13 +2920,17 @@ msgstr "Opdracht is afgebroken\n" msgid "--stat requires file names" msgstr "Optie '--stat' vereist bestandsnamen" -#~ msgid "Cannot get working directory" -#~ msgstr "Kan werkmap niet achterhalen" +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "Optie '--occurrence' kan niet gebruikt worden met '%s'" -#~ msgid "sort names to extract to match archive" -#~ msgstr "" -#~ "uit te pakken namen sorteren zodanig dat ze overeenkomen met de volgorde " -#~ "in het archief" +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "Opties '--listed-incremental' en '--newer' gaan niet samen" + +#~ msgid "--verify cannot be used with %s" +#~ msgstr "Optie '--verify' kan niet gebruikt worden met '%s'" + +#~ msgid "--preserve-order is not compatible with --listed-incremental" +#~ msgstr "Opties '--preserve-order' en '--listed-incremental' gaan niet samen" #~ msgid "Field too long while reading snapshot file" #~ msgstr "Veld is te lang, tijdens lezen van snapshot-bestand" @@ -2917,12 +2941,20 @@ msgstr "Optie '--stat' vereist bestandsnamen" #~ msgid "Unexpected field value in snapshot file" #~ msgstr "Onverwachte veldwaarde in snapshot-bestand" +#~ msgid "Cannot get working directory" +#~ msgstr "Kan werkmap niet achterhalen" + +#~ msgid "sort names to extract to match archive" +#~ msgstr "" +#~ "uit te pakken namen sorteren zodanig dat ze overeenkomen met de volgorde " +#~ "in het archief" + +#~ msgid "Invalid owner" +#~ msgstr "Ongeldige eigenaar" + #~ msgid "Extended header length is out of allowed range" #~ msgstr "Lengte van uitgebreide kop valt buiten bereik" -#~ msgid "Invalid group" -#~ msgstr "Ongeldige groep" - #~ msgid "%s: Directory removed before we read it" #~ msgstr "%s: Map werd verwijderd voordat deze gelezen kon worden" diff --git a/po/pl.gmo b/po/pl.gmo index 4afec54..79219f5 100644 Binary files a/po/pl.gmo and b/po/pl.gmo differ diff --git a/po/pl.po b/po/pl.po index 925bc27..36dd5a1 100644 --- a/po/pl.po +++ b/po/pl.po @@ -3,12 +3,12 @@ # This file is distributed under the same license as the tar package. # RafaÅ‚ Maszkowski , 1996, 1997, 2000, 2001, 2003, 2004, 2006-2011. „†# Thanks to Jakub Bogusz for remarks and corrections, 2003, 2004, 2007, 2008, 2010. -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" "Project-Id-Version: tar 1.26\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" "PO-Revision-Date: 2011-03-12 18:25+0100\n" "Last-Translator: RafaÅ‚ Maszkowski \n" "Language-Team: Polish \n" @@ -100,7 +100,7 @@ msgstr "wyÅ›wietlenie tego opisu" msgid "give a short usage message" msgstr "krótka informacja o opcjach" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "NAZWA" @@ -435,7 +435,7 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: Nie można %s" @@ -444,27 +444,27 @@ msgstr "%s: Nie można %s" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: Uwaga: Nie można %s" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: Nie można zmienić uprawnieÅ„ na %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: Nie można zmienić wÅ‚aÅ›ciciela na uid %lu, gid %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: Nie można utworzyć Å‚Ä…cza do %s" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" @@ -472,7 +472,7 @@ msgstr[0] "%s: BÅ‚Ä…d czytania, bajt %s, przy czytaniu %lu bajtu" msgstr[1] "%s: BÅ‚Ä…d czytania, bajt %s, przy czytaniu %lu bajtów" msgstr[2] "%s: BÅ‚Ä…d czytania, bajt %s, przy czytaniu %lu bajtów" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" @@ -480,22 +480,22 @@ msgstr[0] "%s: Uwaga: BÅ‚Ä…d czytania, bajt %s, przy czytaniu %lu bajtu" msgstr[1] "%s: Uwaga: BÅ‚Ä…d czytania, bajt %s, przy czytaniu %lu bajtów" msgstr[2] "%s: Uwaga: BÅ‚Ä…d czytania, bajt %s, przy czytaniu %lu bajtów" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: Nie można ustawić pozycji %s" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: Uwaga: Nie można ustawić wskaźnika na %s" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: Nie można byÅ‚o utworzyć Å‚Ä…cza symbolicznego do %s" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -598,8 +598,8 @@ msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "" "PosÅ‚ugiwanie siÄ™ napÄ™dem taÅ›mowym, przyjmowanie poleceÅ„ od zdalnego procesu" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "LICZBA" @@ -607,10 +607,10 @@ msgstr "LICZBA" msgid "set debug level" msgstr "ustawienie poziomu wypisywania informacji diagnostycznych" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "PLIK" @@ -632,59 +632,67 @@ msgstr "za dużo argumentów" msgid "Garbage command" msgstr "Bezsensowna komenda" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "To nie wyglÄ…da jak archiwum tar" -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" -msgstr "Licza zapisanych bajtów" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" msgstr "Liczba przeczytanych bajtów" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "Licza zapisanych bajtów" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Liczba skasowanych bajtów: %s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(pipe)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "BÅ‚Ä™dna wartość record_size" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Nie podana nazwa archiwum" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Nie można zweryfikować archiwum z/do stdin/stdout" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Archiwum jest skompresowane. Należy użyć opcji %s" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Nie można uaktualnić archiwum skompresowanego" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "Na poczÄ…tku taÅ›my, teraz koÅ„czÄ™" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "Za dużo bÅ‚Ä™dów, koÅ„czÄ™" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" @@ -692,7 +700,7 @@ msgstr[0] "Rozmiar rekordu = %lu blok" msgstr[1] "Rozmiar rekordu = %lu bloki" msgstr[2] "Rozmiar rekordu = %lu bloków" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" @@ -700,38 +708,38 @@ msgstr[0] "Nierówny blok (%lu bajt) w archiwum" msgstr[1] "Nierówny blok (%lu bajty) w archiwum" msgstr[2] "Nierówny blok (%lu bajtów) w archiwum" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "Nie można siÄ™ cofnąć w pliku archiwum; może nie być czytelny bez -i" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek nie zatrzymaÅ‚ siÄ™ na granicy rekordów" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: zawiera bÅ‚Ä™dny numer części" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "PrzepeÅ‚nienie numeru części" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Przygotuj część numer %d dla %s i naciÅ›nij return: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "EOF kiedy byÅ‚a oczekiwana odpowiedź użytkownika" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "UWAGA: Archiwum jest niekompletne" # rare case when `for parts' translates into `części' for both sing. and plural in Polish - rzm -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -742,68 +750,68 @@ msgstr "" " q ZakoÅ„czenie programu tar\n" " y albo Enter Kontynuacja\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Uruchomienie powÅ‚oki\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? Wypisanie tej listy\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Brak nowej części; zakoÅ„czenie pracy.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "Brak nazwy pliku. Spróbuj jeszcze raz.\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" "BÅ‚Ä™dne dane wejÅ›ciowe. WciÅ›nij ? żeby przeczytać informacje pomocnicze\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "%s polecenie zwróciÅ‚o bÅ‚Ä…d" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" "%s prawdopodobnie jest kontynuowany w tej części: nagłówek zawiera skróconÄ… " "nazwÄ™" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s nie jest kontynuowany w tej części" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s to zÅ‚y rozmiar (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Ta część nie jest w kolejnoÅ›ci (%s - %s != %s)" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "Etykieta archiwum nie pasuje do %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "Część %s nie pasuje do %s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -811,7 +819,7 @@ msgstr "" "%s: nazwa pliku jest za dÅ‚uga do zapisania w nagłówku wieloczęściowego " "archiwum GNU, zostanie skrócona" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "zapis nie zakoÅ„czyÅ‚ siÄ™ na granicy bloków" @@ -823,16 +831,16 @@ msgstr[0] "Można byÅ‚o przeczytać tylko %lu z %lu bajtu" msgstr[1] "Można byÅ‚o przeczytać tylko %lu z %lu bajtów" msgstr[2] "Można byÅ‚o przeczytać tylko %lu z %lu bajtów" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "ZawartoÅ›ci siÄ™ różniÄ…" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "Nieoczekiwany EOF w archiwum" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "Różne typy plików" @@ -852,7 +860,7 @@ msgstr "Gid siÄ™ różni" msgid "Mod time differs" msgstr "Czas modyfikacji siÄ™ różni" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Rozmiar siÄ™ różni" @@ -869,29 +877,29 @@ msgstr "ÅÄ…cze symboliczne siÄ™ różni" msgid "Device number differs" msgstr "RóżniÄ… siÄ™ numery urzÄ…dzeÅ„" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Sprawdzanie " -#: src/compare.c:471 +#: src/compare.c:473 #, fuzzy, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "%s: Nieznany typ pliku `%c' porównywany jako zwykÅ‚y plik" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "Archiwum zawiera nazwy plików bez poczÄ…tkowych elementów Å›cieżek." -#: src/compare.c:533 +#: src/compare.c:535 msgid "Archive contains transformed file names." msgstr "Archiwum zawiera zmienione nazwy plików." -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "Podczas weryfikacji mogÄ… nie być znalezione pliki lokalne" -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" @@ -899,7 +907,7 @@ msgstr[0] "BÅÄ„D WERYFIKACJI: wykryto %d bÅ‚Ä™dny nagłówek" msgstr[1] "BÅÄ„D WERYFIKACJI: wykryto %d bÅ‚Ä™dne nagłówki" msgstr[2] "BÅÄ„D WERYFIKACJI: wykryto %d bÅ‚Ä™dnych nagłówków" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "Samotny blok zerowy przy %s" @@ -948,55 +956,55 @@ msgstr[0] "%s: Plik skurczyÅ‚ siÄ™ o %s bajt; jest dopeÅ‚niany zerami" msgstr[1] "%s: Plik skurczyÅ‚ siÄ™ o %s bajty; jest dopeÅ‚niany zerami" msgstr[2] "%s: Plik skurczyÅ‚ siÄ™ o %s bajtów; jest dopeÅ‚niany zerami" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: plik w innym systemie plików; nie zostaÅ‚ zapisany" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "zawartość nie zostaÅ‚a zapisana" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Nieznany typ pliku; plik zignorowany" -#: src/create.c:1549 +#: src/create.c:1551 #, c-format msgid "Missing links to %s." msgstr "BrakujÄ…ce Å‚Ä…cza do %s." -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: plik jest niezmieniony; nie zostaÅ‚ zapisany" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: plik jest w tym archiwum; nie zostaÅ‚ zapisany" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "katalog nie zostaÅ‚ zapisany" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: plik zmieniÅ‚ siÄ™ w trakcie czytania" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: zignorowane gniazdo z nazwÄ…" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: zignorowany plik door" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Przeskoczenie do nastÄ™pnego nagłówka" @@ -1042,7 +1050,7 @@ msgstr "Próba odtworzenia Å‚Ä…cza symbolicznego jako zwykÅ‚ego" msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Nie można odtworzyć -- plik jest kontynuowany z innej części" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" msgstr "Niespodziewany nagłówek z dÅ‚ugÄ… nazwÄ…" @@ -1086,155 +1094,155 @@ msgstr "%s: plik w innym systemie plików; nie zostaÅ‚ zapisany" msgid "%s: Directory has been renamed" msgstr "%s: Nazwa katalogu zostaÅ‚a zmieniona" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "BÅ‚Ä™dny czas pliku" -#: src/incremen.c:1045 +#: src/incremen.c:1047 #, fuzzy msgid "Invalid modification time" msgstr "BÅ‚Ä™dny czas modyfikacji (sekundy)" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "BÅ‚Ä™dny czas modyfikacji (nanosekundy)" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "BÅ‚Ä™dny numer urzÄ…dzenia" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "BÅ‚Ä™dny numer inodu" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" msgstr "" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" msgstr "Nieoczekiwany EOF w pliku migawkowym" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" msgstr "" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" msgstr "" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "BrakujÄ…ce zakoÅ„czenie rekordu" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "ZÅ‚y format pliku przyrostowego" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "Nie obsÅ‚ugiwana wersja formatu przyrostowego: %" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "ZÅ‚y format katalogu zrzutów: oczekiwano '%c', znaleziono %#3o" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "ZÅ‚y format katalogu zrzutów: powtórzone 'X'" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "ZÅ‚y format katalogu zrzutów: pusta nazwa w 'R'" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "ZÅ‚y format katalogu zrzutów: 'T' nie jest poprzedzone przez 'R'" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "ZÅ‚y format katalogu zrzutów: pusta nazwa w 'T'" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "ZÅ‚y format katalogu zrzutów: oczekiwano '%c', znaleziono koniec danych" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "ZÅ‚y format katalogu zrzutów: nigdy nie użyte 'X'" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Nie można utworzyć katalogu tymczasowego przy użyciu wzorca %s" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Bez skasowania katalogu: nie można odczytać stanu" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: katalog na innym urzÄ…dzeniu: bez skasowania" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: UsuniÄ™cie %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: Nie można usunąć" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: PominiÄ™ty" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "blok %s: ** Blok zer **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "blok: %s: ** Koniec pliku **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "OdstÄ™py w nagłówku zamiast spodziewanej wartoÅ›ci numerycznej %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1242,96 +1250,96 @@ msgstr "" "jak uzupeÅ‚nienie dwójkowe" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Wartość ósemkowa %.*s w archiwum jest spoza zakresu %s" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "Archiwum zawiera przestarzaÅ‚e nagłówki base64" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "W archiwum jest Å‚aÅ„cuch base64 %s spoza zakresu %s" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Wartość base256 w archiwum jest spoza zakresu %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Archiwum zawiera %.*s tam gdzie oczekiwana byÅ‚a liczba %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Wartość %s w archiwum jest spoza zakresu %s %s..%s" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " Å‚Ä…cze do %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " nieznany typ pliku %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--DÅ‚ugie Å‚Ä…cze--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--DÅ‚uga nazwa--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Nagłówek części--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Kontynuacja od bajtu %s--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Tworzony jest katalog:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "Nazwa %s zmieniona na %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Nie można przemianować na %s" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "Nazwa zmieniona z %s z powrotem na %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Plik usuniÄ™ty zanim zostaÅ‚ przeczytany" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "proces potomny" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "kanaÅ‚ miÄ™dzy procesami" @@ -1345,7 +1353,7 @@ msgstr "%s polecenie zwróciÅ‚o bÅ‚Ä…d" msgid "%s: file list requested from %s already read from %s" msgstr "%s: lista plików już przeczytana" -#: src/names.c:448 +#: src/names.c:448 src/checkpoint.c:274 #, fuzzy, c-format msgid "cannot split string '%s': %s" msgstr "nie można ustawić czasu na `%s'" @@ -1355,11 +1363,11 @@ msgstr "nie można ustawić czasu na `%s'" msgid "%s: file name read contains nul character" msgstr "%s: przeczytana nazwa pliku zawiera znak NUL" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "W nazwach plików użyto znaków dopasowania wzorców" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1367,47 +1375,47 @@ msgstr "" "Użyj --wildcards aby wÅ‚Ä…czyć porównywanie wzorców albo --no-wildcards żeby " "wyÅ‚Ä…czyć to ostrzeżenie" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: Nie znalazÅ‚em w archiwum" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Brak podanego wystÄ…pienia pliku w archiwum" -#: src/names.c:876 +#: src/names.c:879 #, c-format msgid "Archive label mismatch" msgstr "Nie pasujÄ…ca etykieta archiwum" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "Nie jest dozwolone używanie opcji -C wewnÄ…trz listy plików razem z --listed-" "incremental" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Z --listed-incremental można użyć tylko jednej opcji -C" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "Opcje `-%s' i `-%s' obie chcÄ… dostÄ™pu do standardowego wejÅ›cia" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s: BÅ‚Ä™dny format archiwum" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "Próba użycia rozszerzeÅ„ GNU z niekompatybilnym formatem archiwum" -#: src/tar.c:255 +#: src/tar.c:264 #, fuzzy, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." @@ -1415,7 +1423,7 @@ msgstr "" "Nieznany styl cytowania `%s'. Użyj `%s --quoting-style=help' żeby zobaczyć " "listÄ™." -#: src/tar.c:364 +#: src/tar.c:378 #, fuzzy msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " @@ -1435,7 +1443,7 @@ msgstr "" "tar.\n" " tar -xf archive.tar # rozpakowanie plików z archive.tar.\n" -#: src/tar.c:373 +#: src/tar.c:387 #, fuzzy msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1459,79 +1467,79 @@ msgstr "" "proste\n" " never, simple proste kopie zapasowe\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "Podstawowe tryby dziaÅ‚ania:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "wypisanie zawartoÅ›ci archiwum" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "rozpakowanie plików z archiwum" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "utworzenie nowego archiwum" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "sprawdzenie różnic miÄ™dzy archiwum i plikami na dysku" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "doÅ‚Ä…czenie plików na koÅ„cu archiwum" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "doÅ‚Ä…czenie tylko plików nowszych niż kopie w archiwum" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "doÅ‚Ä…czenie plików tar do archiwum" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "skasowanie plików z archiwum (nie na taÅ›mie!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "przetestowanie etykiety archiwum i wyjÅ›cie" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "Modyfikatory dziaÅ‚ania:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "efektywne przetwarzanie plików rzadkich" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "MAJOR[.MINOR]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "ustawienie wersji używanego formatu plików rzadkich (wÅ‚Ä…cza --sparse)" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "backup przyrostowy w starym formacie GNU" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "backup przyrostowy w nowym formacie GNU" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "numer poziomu tworzonej albo oglÄ…danej przyrostowej kopii zapasowej" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "bez zakoÅ„czenia bÅ‚Ä™dem jeżeli niedostÄ™pne pliki" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1543,135 +1551,143 @@ msgstr "" "plików jest podana w linii poleceÅ„ albo przez opcjÄ™ -T. LICZBA domyÅ›lnie " "wynosi 1." -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "archiwum o swobodnym dostÄ™pie" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "archiwum bez swobodnego dostÄ™pu" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "bez sprawdzania numerów urzÄ…dzeÅ„ przy tworzeniu archiwów przyrostowych" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "ze sprawdzaniem numerów urzÄ…dzeÅ„ przy tworzeniu archiwów przyrostowych" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "Sterowanie zamazywaniem" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "próba weryfikacji archiwum po zapisaniu" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "usuniÄ™cie plików po dodaniu do archiwum" -#: src/tar.c:471 +#: src/tar.c:485 #, fuzzy msgid "don't replace existing files when extracting, treat them as errors" msgstr "bez zamazania istniejÄ…cych plików rozpakowanymi" -#: src/tar.c:474 +#: src/tar.c:488 #, fuzzy msgid "don't replace existing files when extracting, silently skip over them" msgstr "bez zamazania istniejÄ…cych plików rozpakowanymi" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "" "bez zastÄ™powania istniejÄ…cych plików, które sÄ… nowsze niż ich kopie w " "archiwum" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "nadpisywanie istniejÄ…cych plików" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "usuniÄ™cie każdego pliku przed zamazaniem go rozpakowanym plikiem" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "opróżnianie starych katalogów przed rozpakowaniem kopii z archiwum" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "zachowanie metadanych istniejÄ…cych katalogów" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "nadpisywanie metadanych istniejÄ…cych katalogów przy rozpakowywaniu " "(domyslnie)" -#: src/tar.c:490 +#: src/tar.c:504 #, fuzzy msgid "preserve existing symlinks to directories when extracting" msgstr "nadpisywanie istniejÄ…cych plików" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "KATALOG" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "Wybór strumienia wyjÅ›ciowego" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "rozpakowanie plików na standardowe wyjÅ›cie" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "POLECENIE" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "przekazanie rozpakowywanych plików do innego programu" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "zignorowanie kodów wyjÅ›cia procesów potomnych" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "" "traktowanie niezerowych kodów wyjÅ›ciowych procesów potomnych jako bÅ‚Ä™du" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Przetwarzanie atrybutów plików:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "nadanie wÅ‚aÅ›ciciela NAZWA dodanym plikom" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "nadanie grupy NAZWA dodanym plikom" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "DATA_ALBO_PLIK" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "ustawianie czasu modyfikacji dodanych plików z DATA_ALBO_PLIK" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "ZMIANY" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "ZMIANA uprawnieÅ„ dodanych plików (podanych symbolicznie)" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "METODA" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " @@ -1681,11 +1697,11 @@ msgstr "" "czytaniu (METODA='replace'; domyÅ›lnie) albo przez nieustawianie czasu " "(METODA='system')" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "bez odtworzenia czasu modyfikacji rozpakowanego pliku" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" @@ -1693,22 +1709,22 @@ msgstr "" "staranie siÄ™ o odtworzenie wÅ‚aÅ›cicieli plików wedÅ‚ug zapisu w archiwum " "(domyÅ›lnie dla superusera)" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "" "rozpakowanie plików jako wÅ‚asnoÅ›ci rozpakowujÄ…cego (domyÅ›lnie dla zwykÅ‚ych " "użytkowników)" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "używanie numerów, nie nazw użytkowników/grup" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" "odtworzenie informacji o uprawnieniach plików (domyÅ›lnie dla superusera)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1716,16 +1732,16 @@ msgstr "" "użycie umask użytkownika przy odtwarzaniu uprawnieÅ„ z archiwum (domyÅ›lnie " "dla zwykÅ‚ych użytkowników)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "to samo co równoczeÅ›nie -p i -s" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1733,180 +1749,188 @@ msgstr "" "ustawianie czasów zmian i uprawnieÅ„ odtworzonych katalogów opóźnione do " "koÅ„ca rozpakowywania" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "wyÅ‚Ä…czenie efektu opcji --delay-directory-restore" -#: src/tar.c:554 +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 #, fuzzy msgid "Handling of extended file attributes:" msgstr "Przetwarzanie atrybutów plików:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" msgstr "" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" msgstr "" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" msgstr "" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" msgstr "" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" msgstr "" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" msgstr "" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" msgstr "" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" msgstr "" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "Wybór i przeÅ‚Ä…czanie urzÄ…dzeÅ„:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ARCHIWUM" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "użycie pliku lub urzÄ…dzenia ARCHIWUM" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "plik archiwum lokalny, nawet jeżeli ma dwukropek" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "użyj POLECENIA zamiast /etc/rmt" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "użyj POLECENIA zamiast rsh" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "podanie napÄ™du i gÄ™stoÅ›ci" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "tworzenie/wypisanie/rozpakowanie archiwum wieloczęściowego" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "zmiana taÅ›my po zapisaniu LICZBA x 1024 bajtów" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "uruchomienie skryptu na koÅ„cu taÅ›my (wÅ‚Ä…cza -M)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "użycie/uaktualnienie numeru części w PLIKU" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "Parametry bloków:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "BLOKI" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "BLOKI x 512 bajtów na rekord" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "LICZBA bajtów w rekordzie, wielokrotność 512" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "ignorowanie wyzerowanych bloków w archiwum (oznacza EOF)" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "podzielenie na bloki przy odczycie (dla pipe 4.2BSD)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "Wybór formatu archiwum:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "FORMAT" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "utworzenie archiwum w danym formacie." -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "FORMAT może być jednym z nastÄ™pujÄ…cych:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "stary format tara z V7" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "format GNU dla tara <= 1.12" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "format tara GNU 1.13" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "format POSIX 1003.1-1988 (ustar)" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "format POSIX 1003.1-2001 (pax)" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "to samo co pax" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "to samo co --format=v7" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "to samo co --format=posix" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "sÅ‚owo_kluczowe[[:]=wartość][,sÅ‚owo_kluczowe[[:]=wartość]]..." -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "ustawianie słów kluczowych formatu pax" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "TEKST" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1914,80 +1938,78 @@ msgstr "" "utworzenie archiwum z nazwÄ… wolumenu TEKST. Przy wypisywaniu/rozpakowaniu " "TEKST bÄ™dzie użyty jako wzorzec dopasowania dla nazwy" -#: src/tar.c:660 +#: src/tar.c:684 msgid "Compression options:" msgstr "Opcje kompresji" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "użycie przyrostka nazwy archiwum do ustalenia programu kompresujÄ…cego" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "" "bez używania przyrostka nazwy archiwum do wyznaczenia programu kompresujÄ…cego" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "PROGRAM" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "filtrowanie przez PROGRAM (akceptujÄ…cy -d)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "Wybór plików lokalnych:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" "dodanie podanego PLIKU do archiwum (przydatne jeżeli jego nazwa startuje od " "myÅ›lnika)" -#: src/tar.c:687 -msgid "DIR" -msgstr "KATALOG" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "przejÅ›cie do KATALOGU" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "nazwy plików do rozpakowania lub spakowania z PLIKU" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "-T czyta nazwy zakoÅ„czone zerem, wyÅ‚Ä…cz -C" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "wyÅ‚Ä…czenie efektu użycia opcji --null" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" msgstr "" "usuniÄ™cie znaków cytowania z nazw plików czytanych poprzez opcjÄ™ -T " "(domyÅ›lnie)" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" msgstr "bez usuwania znaków cytowania z nazw plików czytanych poprzez opcjÄ™ -T" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "WZORZEC" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "wykluczenie nazw pasujÄ…cych do WZORCA" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "wykluczenie nazw pasujÄ…cych do wzorców w PLIKU" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1995,93 +2017,107 @@ msgstr "" "wykluczenie katalogów zawierajÄ…cych znacznik pamiÄ™ci podrÄ™cznej CACHEDIR." "TAG, oprócz samych plików znacznika" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "wykluczenie katalogów zawierajÄ…cych CACHEDIR.TAG i ich podkatalogów" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "wykluczenie katalogów zawierajÄ…cych CACHEDIR.TAG" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "wykluczenie katalogów zawierajÄ…cych PLIK, ale nie samego PLIKU" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "wykluczenie katalogów zawierajÄ…cych PLIK i ich podkatalogów" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "wykluczenie katalogów zawierajÄ…cych PLIK" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "wykluczenie katalogów systemu administrowania wersjami" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "wykluczenie plików kopii zapasowych i rezerwacji zasobów" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "bez automatycznego zagÅ‚Ä™biania siÄ™ w katalogi" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "pozostanie w jednym systemie plików" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "zagÅ‚Ä™bianie siÄ™ w podkatalogi (domyÅ›lnie)" -#: src/tar.c:729 +#: src/tar.c:761 #, fuzzy msgid "don't strip leading '/'s from file names" msgstr "bez usuwania poczÄ…tkowego `/' z nazw plików" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "archiwizacja plików, na które wskazujÄ… Å‚Ä…cza symboliczne" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "archiwizacja plików, na które wskazujÄ… Å‚Ä…cza zwykÅ‚e" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "NAZWA-PLIKU" -#: src/tar.c:735 +#: src/tar.c:767 #, fuzzy msgid "begin at member MEMBER-NAME when reading the archive" msgstr "zaczÄ™cie od pliku NAZWA-PLIKU w archiwum" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "zapisanie tylko plików nowszych niż DATA albo data PLIKU" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "DATA" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "porównywanie daty i czasu tylko dla zmienionych danych" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "TRYB" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "kopia zapasowa przed usuniÄ™ciem, wybranie TRYBU zarzÄ…dzania wersjami" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "NAPIS" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -2089,103 +2125,103 @@ msgstr "" "kopia zapasowa przed usuniÄ™ciem, zmiana domyÅ›lnego przyrostka ('~', jeżeli " "nie zmieniony przez zmiennÄ… Å›rodowiska SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "Zmiany nazwy plików:" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "" "uciÄ™cie przed rozpakowaniem LICZBY poczÄ…tkowych elementów Å›cieżki z nazw " "plików" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "WYRAÅ»ENIE" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "użycie WYRAÅ»ENIA zamiany sed-a do przeksztaÅ‚cenia nazw plików" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "Opcje filtracji nazw plików (dotyczÄ… zarówno wzorców wykluczania jak " "wÅ‚Ä…czania):" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "traktowanie tak samo maÅ‚ych i wielkich liter" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "nazwy porównywane od poczÄ…tków nazw plików" -#: src/tar.c:767 +#: src/tar.c:799 #, fuzzy msgid "patterns match after any '/' (default for exclusion)" msgstr "wzorce odnoszÄ… siÄ™ do nazw po każdym / (domyÅ›lnie)" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "odróżnianie maÅ‚ych i wielkich liter (domyÅ›lnie)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "używanie wildcards (domyÅ›lnie dla wykluczania)" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "dosÅ‚owne porównywanie napisów" -#: src/tar.c:775 +#: src/tar.c:807 #, fuzzy msgid "wildcards do not match '/'" msgstr "wildcards nie sÄ… porównywane z `/'" -#: src/tar.c:777 +#: src/tar.c:809 #, fuzzy msgid "wildcards match '/' (default for exclusion)" msgstr "wildcards sÄ… porównywane z '/' (domyÅ›lnie dla wykluczania)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Informacje:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "wypisywanie szczegółów o przetwarzanych plikach" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "SÅOWO KLUCZOWE" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "sterowanie ostrzeżeniami" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" "wypisywanie co ILE rekordów informacji o przetwarzaniu (domyslnie co 10)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "AKCJA" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "wykonanie AKCJI przy każdym punkcie kontrolnym" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "wypisanie komunikatu jeżeli nie wszytkie Å‚Ä…cza zostaÅ‚y zapisane" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "SYGNAÅ" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2197,35 +2233,35 @@ msgstr "" "sygnaÅ‚y: SIGHUP, SIGQUIT, SIGINT, SIGUSR1 i SIGUSR2; nazwy bez prefiksu SIG " "sÄ… też akceptowane" -#: src/tar.c:802 +#: src/tar.c:834 msgid "print file modification times in UTC" msgstr "wypisanie czasów modyfikacji plików w UTC" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "wypisanie czasu pliku z peÅ‚nÄ… dokÅ‚adnoÅ›ciÄ…" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "zapisanie dokÅ‚adnych informacji w PLIKU" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "pokazanie przy każdym komunikacie numeru bloku w archiwum" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "proszenie o potwierdzenie każdego dziaÅ‚ania" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "wypisanie domyÅ›lnych ustawieÅ„ tar-a" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2233,33 +2269,33 @@ msgstr "" "wypisywanie każdego katalogu nie pasujÄ…cego do kryteriów szukania przy " "wypisywaniu albo rozpakowywaniu archiwum" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "pokazanie nazw plików albo archiwów po przeszktaÅ‚ceniu" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "STYL" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "" "ustawienie stylu ujmowania nazw w cudzysÅ‚owy; poniżej dozwolone wartoÅ›ci " "STYLU" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "dodatkowe ujmowanie w znaki cytowania znaków z ÅAŃCUCHA" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "wyÅ‚Ä…czenie ujmowania w znaki cytowania znaków z ÅAŃCUCHA" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "Opcje kompatybilnoÅ›ci:" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2267,15 +2303,15 @@ msgstr "" "przy tworzeniu: to samo co --old-archive przy odtwarzaniu: to co --no-same-" "owner" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "Inne opcje:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "wyÅ‚Ä…czenie używania potencjalnie szkodliwych opcji" -#: src/tar.c:978 +#: src/tar.c:1010 #, fuzzy msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " @@ -2283,40 +2319,40 @@ msgid "" msgstr "" "Nie można podać wiÄ™cej niż jednej opcji z `-Acdtrux' albo `--test-label'" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Niezgodne opcje kompresji" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "Nieznana nazwa sygnaÅ‚u: %s" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "Nie znaleziono pliku z datÄ…" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Postawienie %s w miejscu nieznanego formatu daty %s" -#: src/tar.c:1108 +#: src/tar.c:1140 #, fuzzy, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "Opcja %s: Potraktowanie daty `%s' jako %s" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "filtrowanie archiwum przez %s" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "PrawidÅ‚owe argumenty dla opcji --quoting-style:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2324,48 +2360,48 @@ msgstr "" "\n" "*Ten* tar ma domyÅ›lne parametry:\n" -#: src/tar.c:1295 +#: src/tar.c:1330 #, fuzzy msgid "Invalid owner or group ID" msgstr "BÅ‚Ä™dny wÅ‚aÅ›ciciel" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "BÅ‚Ä™dny współczynnik Å‚Ä…czenia w bloki" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "BÅ‚Ä™dna dÅ‚ugość taÅ›my" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "BÅ‚Ä™dny numer poziomu przyrostowej kopii zapasowej" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "WiÄ™cej niż jedna data graniczna" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "BÅ‚Ä™dna wartość wersji plików rzadkich" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "ten system nie pozwala na użycie --atime-preserve='system'" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "wartość --checkpoint nie jest liczbÄ… caÅ‚kowitÄ…" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "BÅ‚Ä™dne uprawnienia podane w opcji" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "BÅ‚Ä™dny numer" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" @@ -2373,70 +2409,68 @@ msgstr "" "Opcja --preserve jest przestarzaÅ‚a, zamiast niej użyj --preserve-permissions " "--preserve-order" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "BÅ‚Ä™dna wielkość rekordu" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "Rozmiar rekordu musi być wielokrotnoÅ›ciÄ… %d" -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "BÅ‚Ä™dna ilość elementów" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "Wolno użyć tylko jednej opcji polecenia --to-command" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "BÅ‚Ä™dna specyfikacja gÄ™stoÅ›ci: %s" -#: src/tar.c:2133 +#: src/tar.c:2205 #, fuzzy, c-format msgid "Unknown density: '%c'" msgstr "Nieznana gÄ™stość: `%c'" -#: src/tar.c:2150 +#: src/tar.c:2222 #, fuzzy, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "Opcje `-[0-7][lmh]' nie sÄ… używane w *tym* tarze" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[PLIK]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 +#, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "Nie może być użyty wzorzec %s" + +#: src/tar.c:2389 #, fuzzy, c-format msgid "Old option '%c' requires an argument." msgstr "Stara opcja `%c' wymaga argumentu." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence nie ma znaczenia bez listy plików" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "--occurrence nie może być użyte w tym trybie" - -#: src/tar.c:2408 +#: src/tar.c:2490 #, fuzzy msgid "Multiple archive files require '-M' option" msgstr "Archiwum skÅ‚adajÄ…ce siÄ™ z wielu plików wymaga opcji `-M'" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "Nie można poÅ‚Ä…czyć --listed-incremental z --newer" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "opcja --level nic nie znaczy bez użycia --listed-incremental" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" @@ -2444,79 +2478,75 @@ msgstr[0] "%s: Za dÅ‚uga etykieta części (może mieć do %lu bajtu)" msgstr[1] "%s: Za dÅ‚uga etykieta części (może mieć do %lu bajtów)" msgstr[2] "%s: Za dÅ‚uga etykieta części (może mieć do %lu bajtów)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Nie można zweryfikować archiwum wieloczęściowego" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Nie można zweryfikować archiwum skompresowanego" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "Nie może być użyty wzorzec %s" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Nie można używać wieloczęściowego archiwum skompresowanego" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "Nie można poÅ‚Ä…czyć skompresowanych archiwów" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option może być użyta tylko przy archiwach POSIX-owych" -#: src/tar.c:2478 +#: src/tar.c:2560 #, fuzzy msgid "--acls can be used only on POSIX archives" msgstr "--pax-option może być użyta tylko przy archiwach POSIX-owych" -#: src/tar.c:2483 +#: src/tar.c:2565 #, fuzzy msgid "--selinux can be used only on POSIX archives" msgstr "--pax-option może być użyta tylko przy archiwach POSIX-owych" -#: src/tar.c:2488 +#: src/tar.c:2570 #, fuzzy msgid "--xattrs can be used only on POSIX archives" msgstr "--pax-option może być użyta tylko przy archiwach POSIX-owych" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "Nie może być użyty wzorzec %s" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" +msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "DÅ‚ugość części nie może być mniejsza od wielkoÅ›ci rekordu" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "opcja --preserve-order nie może być używana z --listed-incremental" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "Tchórzliwie odmawiam utworzenia pustego archiwum" -#: src/tar.c:2565 +#: src/tar.c:2669 #, fuzzy msgid "Options '-Aru' are incompatible with '-f -'" msgstr "Opcje `-Aru' sÄ… niekompatybilne z `-f -'" -#: src/tar.c:2660 +#: src/tar.c:2766 #, fuzzy msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" msgstr "Musisz podać jednÄ… z opcji `-Acdtrux' albo `--test-label'" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "ZakoÅ„czenie w stanie bÅ‚Ä™du z powodu uprzednich bÅ‚Ä™dów" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" @@ -2525,52 +2555,52 @@ msgstr[0] "%s: Plik skurczyÅ‚ siÄ™ o %s bajt" msgstr[1] "%s: Plik skurczyÅ‚ siÄ™ o %s bajty" msgstr[2] "%s: Plik skurczyÅ‚ siÄ™ o %s bajtów" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "SÅ‚owo kluczowe %s jest nieznane albo jeszcze nie zaimplementowane" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" msgstr "Czas spoza dozwolonego zakresu" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "Nie może być użyty wzorzec %s" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "SÅ‚owo kluczowe %s nie może być zastÄ…pione" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "BÅ‚Ä™dny nagłówek rozszerzony: brakuje dÅ‚ugoÅ›ci" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "DÅ‚ugoÅ›c nagłówka rozszerzonego %*s jest poza zakresem" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "BÅ‚Ä™dny nagłówek rozszerzony: brakuje odstÄ™pu po dÅ‚ugoÅ›ci" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "BÅ‚Ä™dny nagłówek rozszerzony: brakuje znaku równoÅ›ci" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "BÅ‚Ä™dny nagłówek rozszerzony: brakuje znaku mowej linii" -#: src/xheader.c:740 +#: src/xheader.c:741 #, fuzzy, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "Zignorowane nieznane sÅ‚owo kluczowe nagłówka rozszerzonego `%s'" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" @@ -2579,46 +2609,46 @@ msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "Nagłówek rozszerzony - %s=%s jest poza zakresem %s..%s" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "BÅ‚Ä™dny nagłówek rozszerzony: bÅ‚Ä™dny %s=%s" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "BÅ‚Ä™dny nagłówek rozszerzony: nadmiarowe %s=%s" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "BÅ‚Ä™dny nagłówek rozszerzony: bÅ‚Ä™dny %s: niespodziewany ogranicznik %c" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "BÅ‚Ä™dny nagłówek rozszerzony: bÅ‚Ä™dny %s: nieparzysta liczba wartoÅ›ci" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "%s: bÅ‚Ä™dna specyfikacja ograniczenia czasu" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "%s: nieznana akcja przy punkcie kontrolnym" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "zapis" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "odczyt" @@ -2626,7 +2656,7 @@ msgstr "odczyt" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "Punkt kontrolny zapisu %u" @@ -2635,7 +2665,7 @@ msgstr "Punkt kontrolny zapisu %u" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "Punkt kontrolny czytania %u" @@ -2895,12 +2925,19 @@ msgstr "Polecenie zakoÅ„czone\n" msgid "--stat requires file names" msgstr "--stat wymaga podania nazwy pliku" -#~ msgid "Cannot get working directory" -#~ msgstr "Nie można odczytać bieżącego katalogu" - #~ msgid "sort names to extract to match archive" #~ msgstr "pliki do rozpakowania posortowane jak w archiwum" +#, fuzzy +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "--occurrence nie może być użyte w tym trybie" + +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "Nie można poÅ‚Ä…czyć --listed-incremental z --newer" + +#~ msgid "--preserve-order is not compatible with --listed-incremental" +#~ msgstr "opcja --preserve-order nie może być używana z --listed-incremental" + #~ msgid "Field too long while reading snapshot file" #~ msgstr "Za dÅ‚ugie pole w pliku migawkowym" @@ -2910,8 +2947,11 @@ msgstr "--stat wymaga podania nazwy pliku" #~ msgid "Unexpected field value in snapshot file" #~ msgstr "Nieoczekiwana wartość pola w pliku migawkowym" -#~ msgid "Extended header length is out of allowed range" -#~ msgstr "DÅ‚ugość nagłówka rozszerzonego jest poza dozwolonym zakresem" +#~ msgid "Cannot get working directory" +#~ msgstr "Nie można odczytać bieżącego katalogu" #~ msgid "Invalid group" #~ msgstr "BÅ‚Ä™dna grupa" + +#~ msgid "Extended header length is out of allowed range" +#~ msgstr "DÅ‚ugość nagłówka rozszerzonego jest poza dozwolonym zakresem" diff --git a/po/pt.gmo b/po/pt.gmo index 06fb218..8369855 100644 Binary files a/po/pt.gmo and b/po/pt.gmo differ diff --git a/po/pt.po b/po/pt.po index 464c2a5..7de4fbf 100644 --- a/po/pt.po +++ b/po/pt.po @@ -2,12 +2,12 @@ # Copyright (1995) Free Software Foundation, Inc. # António José Coutinho # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" "Project-Id-Version: tar 1.11.9\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" "PO-Revision-Date: 1996-04-20 21:50\n" "Last-Translator: António José Coutinho \n" "Language-Team: Portuguese \n" @@ -101,7 +101,7 @@ msgstr "" msgid "give a short usage message" msgstr "" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "" @@ -141,9 +141,9 @@ msgid "write error" msgstr "Escreve-se registo\n" #: gnu/getopt.c:549 gnu/getopt.c:578 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "A antiga opção `%c' exige um argumento." +msgstr "" #: gnu/getopt.c:626 gnu/getopt.c:630 #, fuzzy, c-format @@ -171,9 +171,9 @@ msgid "%s: unrecognized option '%c%s'\n" msgstr "" #: gnu/getopt.c:807 gnu/getopt.c:810 -#, fuzzy, c-format +#, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "Valor inválido para tamanho de registo (record_size)" +msgstr "" #: gnu/getopt.c:863 gnu/getopt.c:880 gnu/getopt.c:1090 gnu/getopt.c:1108 #, fuzzy, c-format @@ -181,9 +181,9 @@ msgid "%s: option requires an argument -- '%c'\n" msgstr "A antiga opção `%c' exige um argumento." #: gnu/getopt.c:936 gnu/getopt.c:952 -#, fuzzy, c-format +#, c-format msgid "%s: option '-W %s' is ambiguous\n" -msgstr "A antiga opção `%c' exige um argumento." +msgstr "" #: gnu/getopt.c:976 gnu/getopt.c:994 #, fuzzy, c-format @@ -388,9 +388,9 @@ msgid "" msgstr "" #: gnu/version-etc.c:249 -#, fuzzy, c-format +#, c-format msgid "Report %s bugs to: %s\n" -msgstr "Mudou-se o nome %s para %s" +msgstr "" #: gnu/version-etc.c:253 #, c-format @@ -410,7 +410,7 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, fuzzy, c-format msgid "%s: Cannot %s" msgstr "Não se consegue duplicar %s com \"dup\"" @@ -419,27 +419,27 @@ msgstr "N #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, fuzzy, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: Não se pode mudar para o modo para %0.4o" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, fuzzy, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: Não se pode mudar o dono (owner) para \"uid\" %d, \"gid\" %d" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, fuzzy, c-format msgid "%s: Cannot hard link to %s" msgstr "Não se consegue ler a ligação (\"link\") %s" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, fuzzy, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" @@ -450,7 +450,7 @@ msgstr[1] "" "Erro de leitura no \"byte\" %ld, durante a leitura de %d \"bytes\" do " "ficheiro %s" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, fuzzy, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" @@ -461,22 +461,22 @@ msgstr[1] "" "Erro de leitura no \"byte\" %ld, durante a leitura de %d \"bytes\" do " "ficheiro %s" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, fuzzy, c-format msgid "%s: Cannot seek to %s" msgstr "Não se consegue escrever em %s" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, fuzzy, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: Não se conseguiu criar uma ligação simbólica (link) para `%s'" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, fuzzy, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -540,17 +540,17 @@ msgid "Invalid seek direction" msgstr "" #: rmt/rmt.c:446 -#, fuzzy msgid "Invalid seek offset" -msgstr "Formato de data inválido \"%s\"" +msgstr "" #: rmt/rmt.c:452 msgid "Seek offset out of range" msgstr "" #: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608 +#, fuzzy msgid "Invalid byte count" -msgstr "" +msgstr "Formato de data inválido \"%s\"" #: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625 msgid "Byte count out of range" @@ -562,9 +562,8 @@ msgid "Premature eof" msgstr "rmtd: Fim de ficheiro prematuro\n" #: rmt/rmt.c:601 -#, fuzzy msgid "Invalid operation code" -msgstr "Valor inválido para tamanho de registo (record_size)" +msgstr "" #: rmt/rmt.c:636 rmt/rmt.c:680 msgid "Operation not supported" @@ -579,8 +578,8 @@ msgstr "Fim de ficheiro inesperado nos nomes truncados" msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "" @@ -588,10 +587,10 @@ msgstr "" msgid "set debug level" msgstr "" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "" @@ -613,108 +612,116 @@ msgstr "" msgid "Garbage command" msgstr "Comando desconhecido" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Isto não se parece a um arquivo \"tar\"" -#: src/buffer.c:521 src/buffer.c:530 +#: src/buffer.c:574 #, fuzzy -msgid "Total bytes written" +msgid "Total bytes read" msgstr "Número total de de \"bytes\" escritos: %d\n" -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:576 #, fuzzy -msgid "Total bytes read" +msgid "Total bytes written" msgstr "Número total de de \"bytes\" escritos: %d\n" -#: src/buffer.c:532 -#, fuzzy, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Número total de de \"bytes\" escritos: %d\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "Valor inválido para tamanho de registo (record_size)" -#: src/buffer.c:647 +#: src/buffer.c:698 #, fuzzy msgid "No archive name given" msgstr "Não deram nome de arquivo, que fazer?" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Não se pode de verificar arquivos stdin ou stdout" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 #, fuzzy msgid "Cannot update compressed archives" msgstr "Não se pode actualizar o verificar um arquivo comprimido" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "No princípio da fita, pára-se imediatamente" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "Erros de mais: termina-se" -#: src/buffer.c:893 +#: src/buffer.c:944 #, fuzzy, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Tamanho de bloco (blocksize) = blocos de %d" msgstr[1] "Tamanho de bloco (blocksize) = blocos de %d" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "" msgstr[1] "" -#: src/buffer.c:991 +#: src/buffer.c:1042 #, fuzzy msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "Não se conseguiu recuar o arquivo; pode ser ilegível sem -i" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, fuzzy, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "\aPreparar o volume no. %d para %s e premir \"Return\": " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "ATENÇÃO: O arquivo está incompleto" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -726,71 +733,71 @@ msgstr "" " ! Criar uma \"sub-shell\" (interpretador de comandos)\n" " ? Escrever esta lista\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Não há novo volume; termina-se. \n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, fuzzy, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s não tem continuidade neste volume" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s não tem continuidade neste volume" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, fuzzy, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s não é a dimensão correcta (%ld != %ld + %ld)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Este volume está fora da sequência" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, fuzzy, c-format msgid "Archive not labeled to match %s" msgstr "O arquivo não tem etiqueta e não condiz com %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, fuzzy, c-format msgid "Volume %s does not match %s" msgstr "O volume não condiz! %s!=%s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" -#: src/buffer.c:1866 +#: src/buffer.c:1917 #, fuzzy msgid "write did not end on a block boundary" msgstr "" @@ -803,17 +810,17 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "%s: Só se pôde ler %d de um total de %ld \"bytes\"\n" msgstr[1] "%s: Só se pôde ler %d de um total de %ld \"bytes\"\n" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 #, fuzzy msgid "Contents differ" msgstr "Tempo de modificação" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "Fim de ficheiro inesperado no arquivo" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 #, fuzzy msgid "File type differs" msgstr "%s: Ligação (\"link\") simbólica é diferente\n" @@ -837,7 +844,7 @@ msgstr "%s: %s diferente\n" msgid "Mod time differs" msgstr "Tempo de modificação" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 #, fuzzy msgid "Size differs" msgstr "%s: Ligação (\"link\") simbólica é diferente\n" @@ -857,38 +864,38 @@ msgstr "%s: Liga msgid "Device number differs" msgstr "%s: Os números do periférico mudaram\n" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Verificação" -#: src/compare.c:471 +#: src/compare.c:473 #, fuzzy, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "" "Tipo de ficheiro \"%c\" desconhecido para %s; comparado como um ficheiro " "normal" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "" -#: src/compare.c:533 +#: src/compare.c:535 msgid "Archive contains transformed file names." msgstr "" -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "" -#: src/compare.c:612 +#: src/compare.c:614 #, fuzzy, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "ERRO DE VERIFICAÇÃO: Encontraram-se %d cabeçalhos inválidos" msgstr[1] "ERRO DE VERIFICAÇÃO: Encontraram-se %d cabeçalhos inválidos" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "" @@ -934,56 +941,56 @@ msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "O ficheiro %s diminuiu em %d \"bytes\", será completado com zeros" msgstr[1] "O ficheiro %s diminuiu em %d \"bytes\", será completado com zeros" -#: src/create.c:1180 +#: src/create.c:1182 #, fuzzy, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: Está num outro sistema de ficheiros; não será arquivado" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 #, fuzzy msgid "contents not dumped" msgstr " (imagem da memória despejada \"core dumped\")" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Tipo de ficheiro desconhecido; ficheiro ignorado" -#: src/create.c:1549 +#: src/create.c:1551 #, fuzzy, c-format msgid "Missing links to %s." msgstr " ligação para %s\n" -#: src/create.c:1710 +#: src/create.c:1712 #, fuzzy, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: não foi modificado; não será arquivado" -#: src/create.c:1719 +#: src/create.c:1721 #, fuzzy, c-format msgid "%s: file is the archive; not dumped" msgstr "%s é o arquivo; não será arquivado" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Salta para próximo cabeçalho" @@ -1032,7 +1039,7 @@ msgid "%s: Cannot extract -- file is continued from another volume" msgstr "" "Não se pode extraír `%s' -- é a continuação de um ficheiro de outro volume" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 #, fuzzy msgid "Unexpected long name header" msgstr "Fim de ficheiro inesperado no ficheiro de arquivo" @@ -1079,251 +1086,250 @@ msgstr "%s: Est msgid "%s: Directory has been renamed" msgstr "Mudou-se o nome do directoria %s" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "" -#: src/incremen.c:1045 -#, fuzzy +#: src/incremen.c:1047 msgid "Invalid modification time" -msgstr "Valor inválido para tamanho de registo (record_size)" +msgstr "" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" msgstr "" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Fim de ficheiro inesperado no ficheiro de arquivo" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" msgstr "" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" msgstr "" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Não se pode mudar para a directoria %s" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Apaga-se %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, fuzzy, c-format msgid "%s: Cannot remove" msgstr "Não se consegue apagar %s" -#: src/list.c:189 +#: src/list.c:217 #, fuzzy, c-format msgid "%s: Omitting" msgstr "Omite-se %s" -#: src/list.c:206 +#: src/list.c:235 #, fuzzy, c-format msgid "block %s: ** Block of NULs **\n" msgstr "bloco %10ld: ** Bloco de NULs **\n" -#: src/list.c:232 +#: src/list.c:261 #, fuzzy, c-format msgid "block %s: ** End of File **\n" msgstr "bloco %10ld: ** Fim-de-ficheiro **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, fuzzy, c-format msgid "block %s: " msgstr "bloco %10ld: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" -#: src/list.c:854 +#: src/list.c:883 #, fuzzy, c-format msgid "Archive base-256 value is out of %s range" msgstr "Este volume está fora da sequência" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " ligação para %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, fuzzy, c-format msgid " unknown file type %s\n" msgstr " tipo de ficheiro desconhecido \"%c\"\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Cabeçalho de volume--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, fuzzy, c-format msgid "--Continued at byte %s--\n" msgstr "--Continua no \"byte\" %ld--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Criação de directoria::" -#: src/misc.c:721 +#: src/misc.c:726 #, fuzzy, c-format msgid "Renaming %s to %s\n" msgstr "Mudou-se o nome %s para %s" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, fuzzy, c-format msgid "%s: Cannot rename to %s" msgstr "Não se consegue mudar o nome de %s para %s" -#: src/misc.c:754 +#: src/misc.c:759 #, fuzzy, c-format msgid "Renaming %s back to %s\n" msgstr "Mudou-se o nome %s para %s" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "" @@ -1336,72 +1342,72 @@ msgstr "" msgid "%s: file list requested from %s already read from %s" msgstr "" -#: src/names.c:448 +#: src/names.c:448 src/checkpoint.c:274 #, fuzzy, c-format msgid "cannot split string '%s': %s" -msgstr "Não se consegue executar \"stat\" para o ficheiro %s" +msgstr "Não se pode criar uma ligação (\"link\") simbólica de %s para %s" #: src/names.c:490 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: Não foi encontrado no arquivo" -#: src/names.c:842 +#: src/names.c:845 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Não foi encontrado no arquivo" -#: src/names.c:876 +#: src/names.c:879 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "O arquivo não tem etiqueta e não condiz com %s" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "Ambas as opções `-%s' e `-%s' precisam do \"standard input\"" -#: src/tar.c:163 +#: src/tar.c:164 #, fuzzy, c-format msgid "%s: Invalid archive format" msgstr "Formato de data inválido \"%s\"" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "" "Estão-se a querer propriedades GNU num arquivo com formato incompatível" -#: src/tar.c:255 +#: src/tar.c:264 #, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." msgstr "" -#: src/tar.c:364 +#: src/tar.c:378 msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1412,7 +1418,7 @@ msgid "" " tar -xf archive.tar # Extract all files from archive.tar.\n" msgstr "" -#: src/tar.c:373 +#: src/tar.c:387 msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" "The version control may be set with --backup or VERSION_CONTROL, values " @@ -1424,80 +1430,80 @@ msgid "" " never, simple always make simple backups\n" msgstr "" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "" -#: src/tar.c:411 +#: src/tar.c:425 #, fuzzy msgid "create a new archive" msgstr "Fim de ficheiro inesperado no arquivo" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1505,616 +1511,641 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:469 +#: src/tar.c:483 #, fuzzy msgid "remove files after adding them to the archive" msgstr "Retira-se a especificação do \"drive\" aos nomes no arquivo" -#: src/tar.c:471 +#: src/tar.c:485 msgid "don't replace existing files when extracting, treat them as errors" msgstr "" -#: src/tar.c:474 +#: src/tar.c:488 msgid "don't replace existing files when extracting, silently skip over them" msgstr "" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:490 +#: src/tar.c:504 msgid "preserve existing symlinks to directories when extracting" msgstr "" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " "place (METHOD='system')" msgstr "" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" msgstr "" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:554 +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 msgid "Handling of extended file attributes:" msgstr "" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" msgstr "" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" msgstr "" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" msgstr "" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" msgstr "" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" msgstr "" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" msgstr "" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" msgstr "" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" msgstr "" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "" -#: src/tar.c:603 +#: src/tar.c:627 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Não se pode verificar arquivos multi-volume" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:629 +#: src/tar.c:653 #, fuzzy msgid "Archive format selection:" msgstr "Arquivo para stdin" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:660 +#: src/tar.c:684 #, fuzzy msgid "Compression options:" msgstr "Há conflitos entre as opções de compressão" -#: src/tar.c:662 +#: src/tar.c:686 #, fuzzy msgid "use archive suffix to determine the compression program" msgstr "Não se consegue escrever para o programa de compressão" -#: src/tar.c:664 +#: src/tar.c:688 #, fuzzy msgid "do not use archive suffix to determine the compression program" msgstr "Não se consegue escrever para o programa de compressão" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:687 -msgid "DIR" -msgstr "" - -#: src/tar.c:688 +#: src/tar.c:712 #, fuzzy msgid "change to directory DIR" msgstr "Não se pode mudar para a directoria %s" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +msgid "unquote input file or member names (default)" msgstr "" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +msgid "do not unquote input file or member names" msgstr "" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:729 +#: src/tar.c:761 #, fuzzy msgid "don't strip leading '/'s from file names" msgstr "Retira-se \"/\" das ligações (\"links\") absolutas " -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:735 +#: src/tar.c:767 msgid "begin at member MEMBER-NAME when reading the archive" msgstr "" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "" -#: src/tar.c:767 +#: src/tar.c:799 msgid "patterns match after any '/' (default for exclusion)" msgstr "" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "" -#: src/tar.c:775 -#, fuzzy +#: src/tar.c:807 msgid "wildcards do not match '/'" -msgstr "O volume não condiz! %s!=%s" +msgstr "" -#: src/tar.c:777 +#: src/tar.c:809 msgid "wildcards match '/' (default for exclusion)" msgstr "" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2122,316 +2153,309 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:802 +#: src/tar.c:834 msgid "print file modification times in UTC" msgstr "" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:810 +#: src/tar.c:842 #, fuzzy msgid "ask for confirmation for every action" msgstr "Não se consegue obter confirmação, do utilizador" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:978 +#: src/tar.c:1010 #, fuzzy msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" msgstr "Não se pode especificar mais do que uma das opções \"-Acdtrux\"" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Há conflitos entre as opções de compressão" -#: src/tar.c:1047 +#: src/tar.c:1079 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr "Opção \"%c\" desconhecida" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "" -#: src/tar.c:1108 +#: src/tar.c:1140 #, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1295 -#, fuzzy +#: src/tar.c:1330 msgid "Invalid owner or group ID" -msgstr "Valor inválido para tamanho de registo (record_size)" +msgstr "" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1926 +#: src/tar.c:1993 #, fuzzy msgid "Invalid record size" msgstr "Valor inválido para tamanho de registo (record_size)" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "O tamanho dos registos tem que ser múltiplo de %d." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "" -#: src/tar.c:1995 +#: src/tar.c:2067 #, fuzzy msgid "Only one --to-command option allowed" msgstr "Só se permite uma opção de compressão" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:2133 +#: src/tar.c:2205 #, fuzzy, c-format msgid "Unknown density: '%c'" msgstr "Opção \"%c\" desconhecida" -#: src/tar.c:2150 +#: src/tar.c:2222 #, fuzzy, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "As opções \"-[0-7][lmh]\" não são suportadas por *este* tar" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "" -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 +#, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "Não se consegue escrever em %s" + +#: src/tar.c:2389 #, fuzzy, c-format msgid "Old option '%c' requires an argument." msgstr "A antiga opção `%c' exige um argumento." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2389 -#, c-format -msgid "--occurrence cannot be used with %s" -msgstr "" - -#: src/tar.c:2408 +#: src/tar.c:2490 #, fuzzy msgid "Multiple archive files require '-M' option" msgstr "Para usar vários arquivos é necessária a opção \"-M\"" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "" msgstr[1] "" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Não se pode verificar arquivos multi-volume" -#: src/tar.c:2448 +#: src/tar.c:2530 #, fuzzy msgid "Cannot verify compressed archives" msgstr "Não se pode actualizar o verificar um arquivo comprimido" -#: src/tar.c:2450 -#, c-format -msgid "--verify cannot be used with %s" -msgstr "" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Não se pode de usar arquivos multi-volume comprimidos" -#: src/tar.c:2461 +#: src/tar.c:2543 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Não se pode actualizar o verificar um arquivo comprimido" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2478 +#: src/tar.c:2560 msgid "--acls can be used only on POSIX archives" msgstr "" -#: src/tar.c:2483 +#: src/tar.c:2565 msgid "--selinux can be used only on POSIX archives" msgstr "" -#: src/tar.c:2488 +#: src/tar.c:2570 msgid "--xattrs can be used only on POSIX archives" msgstr "" -#: src/tar.c:2493 -#, c-format -msgid "--%s option cannot be used with %s" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "Recusa-se, covardemente, a criar um arquivo vazio" -#: src/tar.c:2565 +#: src/tar.c:2669 #, fuzzy msgid "Options '-Aru' are incompatible with '-f -'" msgstr "As opções \"-Aru\" são imcompatíveis com \"-f -\"" -#: src/tar.c:2660 +#: src/tar.c:2766 #, fuzzy msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" msgstr "Tem que se especificar uma das opções \"-Acdtrux\"" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, fuzzy, c-format msgid "%s: File shrank by %s byte" @@ -2439,98 +2463,98 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: O ficheiro diminui em %d bytes, (desgraça!)" msgstr[1] "%s: O ficheiro diminui em %d bytes, (desgraça!)" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" msgstr "" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "" -#: src/xheader.c:740 +#: src/xheader.c:741 #, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "" @@ -2538,7 +2562,7 @@ msgstr "" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, fuzzy, c-format msgid "Write checkpoint %u" msgstr "Escreve-se o ponto de verificação %d" @@ -2547,7 +2571,7 @@ msgstr "Escreve-se o ponto de verifica #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, fuzzy, c-format msgid "Read checkpoint %u" msgstr "Leu-se o ponto de verificação %d" @@ -2616,11 +2640,8 @@ msgid "Synchronous execution options:" msgstr "" #: tests/genfile.c:163 -#, fuzzy msgid "OPTION" msgstr "" -"\n" -"Forma de usar: %s [OPÇÃO]...\n" #: tests/genfile.c:164 msgid "" @@ -2752,7 +2773,7 @@ msgstr "N #: tests/genfile.c:692 #, fuzzy, c-format msgid "cannot truncate `%s'" -msgstr "Não se consegue abrir %s" +msgstr "Não se consegue executar \"stat\" para %s" #: tests/genfile.c:701 #, c-format @@ -2762,7 +2783,7 @@ msgstr "" #: tests/genfile.c:706 #, fuzzy, c-format msgid "cannot unlink `%s'" -msgstr "Não se consegue abrir %s" +msgstr "Não se consegue ler a ligação (\"link\") %s" #: tests/genfile.c:833 #, c-format @@ -2799,45 +2820,6 @@ msgstr "" msgid "--stat requires file names" msgstr "--Nomes de ficheiros truncados--\n" -#, fuzzy -#~ msgid "Cannot get working directory" -#~ msgstr "Não se pode mudar para a directoria %s" - -#, fuzzy -#~ msgid "Read error in snapshot file" -#~ msgstr "Erro de leitura sobre %s" - -#, fuzzy -#~ msgid "Unexpected field value in snapshot file" -#~ msgstr "Fim de ficheiro inesperado no ficheiro de arquivo" - -#, fuzzy -#~ msgid "%s: Directory removed before we read it" -#~ msgstr "Mudou-se o nome do directoria %s" - -#, fuzzy -#~ msgid "Cannot restore working directory" -#~ msgstr "Não se pode mudar para a directoria %s" - -#, fuzzy -#~ msgid "Cannot resolve hostname %s" -#~ msgstr "Não se consegue mudar o nome de %s para %s" - -#~ msgid "Reading %s\n" -#~ msgstr "Leitura de %s\n" - -#~ msgid "rmtd: Cannot allocate buffer space\n" -#~ msgstr "rmtd: Não se consegue reservar espaço temporário (\"buffers\")\n" - -#~ msgid "Cannot allocate buffer space" -#~ msgstr "Não se consegue reservar espaço temporário (\"buffer\")" - -#~ msgid "Try `%s --help' for more information.\n" -#~ msgstr "Para mais informação, tente \"%s --help\".\n" - -#~ msgid "Premature end of file" -#~ msgstr "Fim-de-ficheiro prematuro" - #~ msgid "Cannot close file #%d" #~ msgstr "Não se consegue fechar o ficheiro #%d" @@ -2902,6 +2884,12 @@ msgstr "--Nomes de ficheiros truncados--\n" #~ msgid "Only wrote %u of %u bytes to %s" #~ msgstr "Só se escreveram %u \"bytes\" de um total de %u em %s" +#~ msgid "Read error on %s" +#~ msgstr "Erro de leitura sobre %s" + +#~ msgid "Reading %s\n" +#~ msgstr "Leitura de %s\n" + #~ msgid "WARNING: No volume header" #~ msgstr "ATENÇÃO: Não há cabeçalho de volume" @@ -3042,9 +3030,6 @@ msgstr "--Nomes de ficheiros truncados--\n" #~ msgid "Visible long name error" #~ msgstr "Erro evidente num nome longo" -#~ msgid "Cannot stat %s" -#~ msgstr "Não se consegue executar \"stat\" para %s" - #~ msgid "Could not get current directory: %s" #~ msgstr "Não se conseguiu determinar a directoria corrente: %s" @@ -3073,9 +3058,6 @@ msgstr "--Nomes de ficheiros truncados--\n" #~ msgid "Visible longname error" #~ msgstr "Erro evidente num nome longo" -#~ msgid "Cannot symlink %s to %s" -#~ msgstr "Não se pode criar uma ligação (\"link\") simbólica de %s para %s" - #~ msgid "Symlinked %s to %s" #~ msgstr "%s ligado simbolicamente a %s (\"link\")" @@ -3085,6 +3067,15 @@ msgstr "--Nomes de ficheiros truncados--\n" #~ msgid "Missing file name after -C" #~ msgstr "Falta um nome de ficheiro após \"-C\"" +#~ msgid "rmtd: Cannot allocate buffer space\n" +#~ msgstr "rmtd: Não se consegue reservar espaço temporário (\"buffers\")\n" + +#~ msgid "Cannot allocate buffer space" +#~ msgstr "Não se consegue reservar espaço temporário (\"buffer\")" + +#~ msgid "Premature end of file" +#~ msgstr "Fim-de-ficheiro prematuro" + #~ msgid "rmtd: Garbage command %c\n" #~ msgstr "rmtd: Comando \"%c\" não faz sentido\n" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo index c8c1045..d10b1b3 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 a357fdb..5c2e7b4 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1,9 +1,9 @@ # tar: translation to Brazilian Portuguese (pt_BR) # Copyright (C) 1995, 2002 Free Software Foundation, Inc. # This file is distributed under the same license as the tar package. -# Lucas Inojosa C. Ferreira , 2013. # Rodolfo Ferraz , 2013. # Eduardo Tenorio , 2013. +# Lucas Inojosa C. Ferreira , 2013. # based on the previous translation to pt_BR (1.26) by # Alexandre Folle de Menezes , 2002. # based on the previous translation to pt_BR (1.13.17) by @@ -12,12 +12,12 @@ # António José Coutinho , 1996. # Marcus Moreira de Souza # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" "Project-Id-Version: tar 1.26\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" "PO-Revision-Date: 2013-01-24 21:39-0300\n" "Last-Translator: Lucas Inojosa C. Ferreira \n" "Language-Team: Brazilian Portuguese .\n" "Este software é livre: você é livre para modificá-lo e redistribuí-lo.\n" -"NÃO HÁ GARANTIA, além da permitida pela lei.\n" +"NÃO HÁ GARANTIA além da permitida pela lei.\n" "\n" #. TRANSLATORS: %s denotes an author name. #: gnu/version-etc.c:104 -#, fuzzy, c-format +#, c-format msgid "Written by %s.\n" -msgstr "Escrito por %s\n" +msgstr "Escrito por %s.\n" #. TRANSLATORS: Each %s denotes an author name. #: gnu/version-etc.c:108 -#, fuzzy, c-format +#, c-format msgid "Written by %s and %s.\n" msgstr "Escrito por %s e %s.\n" #. TRANSLATORS: Each %s denotes an author name. #: gnu/version-etc.c:112 -#, fuzzy, c-format +#, c-format msgid "Written by %s, %s, and %s.\n" msgstr "Escrito por %s, %s e %s.\n" @@ -427,9 +427,9 @@ msgstr "" "ou .\n" #: gnu/version-etc.c:249 -#, fuzzy, c-format +#, c-format msgid "Report %s bugs to: %s\n" -msgstr "Informar %s erros no programa para %s\n" +msgstr "Informar %s erros no programa para: %s\n" #: gnu/version-etc.c:253 #, c-format @@ -449,7 +449,7 @@ msgstr "Ajuda para uso de softwares GNU: \n" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: Não é possível executar a ação: %s" @@ -458,80 +458,79 @@ msgstr "%s: N #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: Atenção: Não é possível executar a ação: %s" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: Impossível mudar modo para %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: Impossível alterar dono para uid %lu, gid %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: Impossível fazer link para %s" -#: lib/paxerror.c:179 lib/paxerror.c:211 -#, fuzzy, c-format +#: lib/paxerror.c:181 lib/paxerror.c:213 +#, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" -msgstr[0] "%s: Erro de leitura no byte %s, lendo %lu bytes" +msgstr[0] "%s: Erro de leitura no byte %s, lendo %lu byte" msgstr[1] "%s: Erro de leitura no byte %s, lendo %lu bytes" -#: lib/paxerror.c:192 -#, fuzzy, c-format +#: lib/paxerror.c:194 +#, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" -msgstr[0] "%s: Aviso: Erro de leitura no byte %s, lendo %lu bytes" +msgstr[0] "%s: Aviso: Erro de leitura no byte %s, lendo %lu byte" msgstr[1] "%s: Aviso: Erro de leitura no byte %s, lendo %lu bytes" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: Impossível saltar para %s" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: Aviso: Não é possível saltar para %s" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: Impossível criar link simbólico para %s" -#: lib/paxerror.c:349 -#, fuzzy, c-format +#: lib/paxerror.c:351 +#, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" -msgstr[0] "%s: Gravados apenas %lu de um total de %lu bytes" +msgstr[0] "%s: Gravados apenas %lu de um total de %lu byte" msgstr[1] "%s: Gravados apenas %lu de um total de %lu bytes" #: lib/paxnames.c:140 -#, fuzzy, c-format +#, c-format msgid "Removing leading `%s' from member names" -msgstr "Removendo `%.*s' inicial dos nomes dos membros" +msgstr "Removendo `%s' inicial dos nomes dos membros" #: lib/paxnames.c:141 -#, fuzzy, c-format +#, c-format msgid "Removing leading `%s' from hard link targets" -msgstr "Removendo `%.*s' inicial dos nomes dos membros" +msgstr "Removendo `%s' inicial dos alvos de hard link" #: lib/paxnames.c:154 -#, fuzzy msgid "Substituting `.' for empty member name" -msgstr "Removendo `%.*s' inicial dos nomes dos membros" +msgstr "Substituindo `.' para nome de membro vazio" #: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" -msgstr "Substituindo `.' por alvo vazio para hard link" +msgstr "Substituindo `.' para alvo de hard link vazio" #: lib/rtapelib.c:299 #, c-format @@ -568,54 +567,47 @@ msgid "Seek direction out of range" msgstr "Direção de procura fora de faixa" #: rmt/rmt.c:438 -#, fuzzy msgid "Invalid seek direction" -msgstr "Modo inválido informado na opção" +msgstr "Direção de procura inválida" #: rmt/rmt.c:446 -#, fuzzy msgid "Invalid seek offset" -msgstr "Carimbo de horário inválido" +msgstr "Deslocamento de procura inválido" #: rmt/rmt.c:452 msgid "Seek offset out of range" msgstr "Deslocamento de procura fora de faixa" #: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608 -#, fuzzy msgid "Invalid byte count" -msgstr "Tamanho da fita inválido" +msgstr "Contagem de byte inválida" #: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625 -#, fuzzy msgid "Byte count out of range" -msgstr "Deslocamento de procura fora de faixa" +msgstr "Contagem de byte fora de faixa" #: rmt/rmt.c:558 -#, fuzzy msgid "Premature eof" -msgstr "rmtd: Fim de arquivo prematuro\n" +msgstr "Fim de arquivo (eof) prematuro" #: rmt/rmt.c:601 -#, fuzzy msgid "Invalid operation code" -msgstr "%s: opção inválida -- %c\n" +msgstr "Código de operação inválido" #: rmt/rmt.c:636 rmt/rmt.c:680 msgid "Operation not supported" msgstr "Operação não suportada" #: rmt/rmt.c:664 -#, fuzzy msgid "Unexpected arguments" -msgstr "Fim de arquivo inesperado nos nomes cifrados" +msgstr "Argumentos inesperados" #: rmt/rmt.c:689 msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "Manipula uma unidade de fita, aceitando comandos de um processo remoto" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "NUMERO" @@ -623,10 +615,10 @@ msgstr "NUMERO" msgid "set debug level" msgstr "define nível de debug" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "ARQ" @@ -648,185 +640,192 @@ msgstr "muitos argumentos" msgid "Garbage command" msgstr "Comando sem sentido" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Este não parece ser um arquivo-tar" -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" -msgstr "Total de bytes escritos" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" msgstr "Total de bytes lidos" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "Total de bytes escritos" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Total de bytes apagados: %s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(pipe)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "Valor inválido para \"record_size\"" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Nome de arquivo-tar não informado" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "" "Impossível verificar arquivos-tar de entrada/saída padrão (stdin/stdout)" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "O arquivo está compactado. Use a opção %s" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Impossível atualizar arquivos-tar compactados" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "No princípio da fita, encerrando agora" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "Muitos erros, encerrando" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Tamanho de registro = %lu bloco" msgstr[1] "Tamanho de registro = %lu blocos" -#: src/buffer.c:914 -#, fuzzy, c-format +#: src/buffer.c:965 +#, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" -msgstr[0] "Bloco desalinhado (%lu bytes) no arquivo-tar" +msgstr[0] "Bloco desalinhado (%lu byte) no arquivo-tar" msgstr[1] "Bloco desalinhado (%lu bytes) no arquivo-tar" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "Impossível recuar no arquivo-tar; pode estar ilegível sem -i" -#: src/buffer.c:1023 -#, fuzzy +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek não está parado numa fronteira de registro" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: contém um número de volume inválido" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "Sobrecarga de número de volumes" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Prepare o volume #%d para %s e tecle Enter: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "Fim-de-arquivo onde era esperado resposta do usuário" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "AVISO: O arquivo-tar está incompleto" -#: src/buffer.c:1149 -#, fuzzy, c-format +#: src/buffer.c:1200 +#, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" " q Abort tar\n" " y or newline Continue operation\n" msgstr "" " n nome Dar um novo nome para o(s) próximo(s) volume(s) (e os " -"subseqüentes)\n" +"subsequentes)\n" " q Abortar tar\n" " y ou nova linha Continuar operação\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Criar um sub-shell\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? Mostra esta lista\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Nenhum volume novo; encerrando.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "Nome de arquivo não foi especificado. Tente novamente.\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Entrada inválida. Digite ? para ajuda.\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "comando %s falhou" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" "%s possivelmente é continuado neste volume: o cabeçalho contém o nome " "truncado" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s não é continuado neste volume" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s é o tamanho errado (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Este volume está fora de sequência (%s - %s != %s)" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "O arquivo-tar não rotulado para casar com %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "O volume %s não casa com %s" -#: src/buffer.c:1675 -#, fuzzy, c-format +#: src/buffer.c:1726 +#, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" "%s: nome de arquivo muito longo para ser armazenado num cabeçalho GNU " "multivolume, truncado" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "escrita não acabou numa fronteira de bloco" @@ -837,16 +836,16 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Só foi possível ler %lu de %lu byte" msgstr[1] "Só foi possível ler %lu de %lu bytes" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "O conteúdo é diferente" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "Final-de-arquivo inesperado no arquivo-tar" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "O tipo de arquivo é diferente" @@ -866,7 +865,7 @@ msgstr "os gid s msgid "Mod time differs" msgstr "Os horários de modificação são diferentes" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Os tamanhos são diferentes" @@ -883,39 +882,38 @@ msgstr "O (\"Link\") simb msgid "Device number differs" msgstr "O número de dispositivo é diferente" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Verificar " -#: src/compare.c:471 +#: src/compare.c:473 #, fuzzy, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "" "%s: Tipo de arquivo `%c' desconhecido, comparado como um arquivo normal" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "" "O arquivo-tar contém nome de arquivos com os prefixos principais removidos" -#: src/compare.c:533 -#, fuzzy +#: src/compare.c:535 msgid "Archive contains transformed file names." msgstr "O arquivo-tar contém nomes de arquivos transformados." -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "A verificação pode falhar em localizar os arquivos originais." -#: src/compare.c:612 -#, fuzzy, c-format +#: src/compare.c:614 +#, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "ERRO DE VERIFICAÇÃO: detectado %d cabeçalho inválido" msgstr[1] "ERRO DE VERIFICAÇÃO: detectados %d cabeçalhos inválidos" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "Bloco de zero isolado em %s" @@ -952,66 +950,66 @@ msgstr "" "arquivado" #: src/create.c:638 -#, fuzzy, c-format +#, c-format msgid "%s: link name is too long; not dumped" msgstr "%s: Nome de link muito grande; não será arquivado" #: src/create.c:1084 -#, fuzzy, c-format +#, c-format msgid "%s: File shrank by %s byte; padding with zeros" msgid_plural "%s: File shrank by %s bytes; padding with zeros" -msgstr[0] "%s: o arquivo diminuiu %s bytes; completando com zeros" -msgstr[1] "%s: o arquivo diminuiu %s bytes; completando com zeros" +msgstr[0] "%s: O arquivo diminuiu %s byte; completando com zeros" +msgstr[1] "%s: O arquivo diminuiu %s bytes; completando com zeros" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: arquivo está em outro sistema de arquivos; não será arquivado" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "conteúdos não depositados" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Tipo de arquivo desconhecido; arquivo ignorado" -#: src/create.c:1549 -#, fuzzy, c-format +#: src/create.c:1551 +#, c-format msgid "Missing links to %s." -msgstr " link para %s\n" +msgstr "Faltando links para %s" -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: arquivo sem alterações; não será arquivado" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: arquivo é o arquivo-tar; não será arquivado" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "diretório não depositado" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: arquivo alterado enquanto estava sendo lido" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: \"socket\" ignorado" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: porta ignorada" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Pulando para o próximo cabeçalho" @@ -1025,9 +1023,9 @@ msgid "%s: implausibly old time stamp %s" msgstr "%s: carimbo de tempo implausivelmente velho %s" #: src/extract.c:320 -#, fuzzy, c-format +#, c-format msgid "%s: time stamp %s is %s s in the future" -msgstr "%s: o carimbo de horário %s está %lu s no futuro" +msgstr "%s: o carimbo de horário %s está %s s no futuro" #: src/extract.c:536 #, c-format @@ -1057,15 +1055,14 @@ msgstr "Tentativa de extrair \"links\" simb msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Impossível extrair -- arquivo é a continuação de outro volume" -#: src/extract.c:1535 src/list.c:1135 -#, fuzzy +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" -msgstr "Fim de arquivo inesperado nos nomes cifrados" +msgstr "Nome longo de cabeçalho inesperado" #: src/extract.c:1542 #, fuzzy, c-format msgid "%s: Unknown file type '%c', extracted as normal file" -msgstr "%s: Tipo de arquivo '%c' desconhecido; extraindo como arquivo normal" +msgstr "%s: Tipo de arquivo `%c' desconhecido; extraído como arquivo normal" #: src/extract.c:1568 #, c-format @@ -1078,14 +1075,14 @@ msgid "%s: Was unable to backup this file" msgstr "%s: Impossível fazer backup deste arquivo" #: src/extract.c:1767 -#, fuzzy, c-format +#, c-format msgid "Cannot rename %s to %s" -msgstr "%s: Impossível renomear para %s" +msgstr "Impossível renomear %s para %s" #: src/incremen.c:494 src/incremen.c:536 -#, fuzzy, c-format +#, c-format msgid "%s: Directory has been renamed from %s" -msgstr "%s: Diretório foi renomeado" +msgstr "%s: Diretório foi renomeado de %s" #: src/incremen.c:549 #, c-format @@ -1102,157 +1099,156 @@ msgstr "%s: arquivo est msgid "%s: Directory has been renamed" msgstr "%s: Diretório foi renomeado" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "Carimbo de horário inválido" -#: src/incremen.c:1045 +#: src/incremen.c:1047 #, fuzzy msgid "Invalid modification time" -msgstr "Modo inválido informado na opção" +msgstr "Tempo de modificação inválido (segundos)" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "Tempo de modificação inválido (nanosegundos)" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "Número de dispositivo inválido" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Número de inode inválido" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" msgstr "" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 -#, fuzzy +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" -msgstr "Final-de-arquivo inesperado no arquivo-tar" +msgstr "Final-de-arquivo (EOF) inesperado em arquivo instantâneo" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" msgstr "" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" msgstr "" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "Faltando registro de terminação" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "Formato de arquivo mal incrementável" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "Versão incremental do formato não suportada: %" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Diretório de despejo malformado: '%c' esperado mas %#3o recebido" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Diretório de despejo malformado: 'X' duplicado" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Diretório de despejo malformado: nome vazio em 'R'" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Diretório de despejo malformado: 'T' não precedido por 'R'" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Diretório de despejo malformado: nome vazio em 'T'" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" "Diretório de despejo malformado: '%c' esperado, mas \"fim de dado\" recebido" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "Diretório de despejo malformado: 'X' nunca usado" -#: src/incremen.c:1656 -#, fuzzy, c-format +#: src/incremen.c:1658 +#, c-format msgid "Cannot create temporary directory using template %s" -msgstr "Impossível alocar memória para um fator de bloco %d" +msgstr "Impossível criar diretório temporarário usando o template %s" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Diretório não purgado: impossibilitado de quantificar" -#: src/incremen.c:1730 -#, fuzzy, c-format +#: src/incremen.c:1732 +#, c-format msgid "%s: directory is on a different device: not purging" -msgstr "%s: arquivo está em outro sistema de arquivos; não será arquivado" +msgstr "%s: diretório está em outro dispositivo; não será arquivado" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Removendo %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: Impossível remover" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: Omitindo" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "bloco %s: ** Bloco de NULs **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "bloco %s: ** Fim-de-arquivo **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "bloco %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Espaço em branco no cabeçalho onde valor numérico `%s' era esperado" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1260,96 +1256,96 @@ msgstr "" "complemento de dois" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "O valor octal do arquivo-tar %.*s está fora de faixa %s" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "o arquivo-tar contém cabeçalhos base-64 obsoletos" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "A string base-64 assinada do arquivo-tar %s está fora de faixa %s" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "O valor base-256 de arquivo-tar está fora da faixa %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "O arquivo-tar contém %.*s onde valor numérico %s era esperado" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "o valor do arquivo-tar %s está fora da faixa %s: %s..%s" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " link para %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " tipo de arquivo \"%s\" desconhecido\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--Link Longo--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--Nome Longo--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Cabeçalho de volume--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Continua no byte %s--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Criando de diretório:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "Renomeando %s para %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Impossível renomear para %s" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "Renomeando %s de volta para %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: arquivo removido antes de ser lido" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "processo filho" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "canal interprocesso" @@ -1361,9 +1357,9 @@ msgstr "comando %s falhou" #: src/names.c:378 #, fuzzy, c-format msgid "%s: file list requested from %s already read from %s" -msgstr "%s: arquivo é o arquivo-tar; não será arquivado" +msgstr "%s: lista de arquivos já lida" -#: src/names.c:448 +#: src/names.c:448 src/checkpoint.c:274 #, fuzzy, c-format msgid "cannot split string '%s': %s" msgstr "ímpossível definir tempo em `%s'" @@ -1373,11 +1369,11 @@ msgstr " msgid "%s: file name read contains nul character" msgstr "" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "Padrão correspondente a caracteres usados em nomes de arquivos" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1385,47 +1381,47 @@ msgstr "" "Use --wildcards para habilitar casamento de padrão, ou --no-wildcards para " "suprimir este aviso" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: Não foi encontrado no arquivo-tar" -#: src/names.c:842 -#, fuzzy, c-format +#: src/names.c:845 +#, c-format msgid "%s: Required occurrence not found in archive" -msgstr "%s: Não foi encontrado no arquivo-tar" +msgstr "%s: Ocorrência pedida não foi encontrada no arquivo-tar" -#: src/names.c:876 -#, fuzzy, c-format +#: src/names.c:879 +#, c-format msgid "Archive label mismatch" -msgstr "O arquivo-tar não rotulado para casar com %s" +msgstr "Arquivo-tar não rotulado para casar" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "Usar a opção -C dentro de lista de arquivo não é permitido com --listed-" "incremental" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Somente uma opção -C é permitida com --listed-incremental" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "Ambas as opções `-%s' e `-%s' exigem a entrada padrão" -#: src/tar.c:163 -#, fuzzy, c-format +#: src/tar.c:164 +#, c-format msgid "%s: Invalid archive format" -msgstr "%s: Grupo inválido" +msgstr "%s: Formato de arquivo inválido" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "Desejadas características GNU num arquivo-tar com formato incompatível" -#: src/tar.c:255 +#: src/tar.c:264 #, fuzzy, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." @@ -1433,7 +1429,7 @@ msgstr "" "Estilo de citação `%s' desconhecido. Tente `%s --quoting-style=help' para " "pegar uma lista." -#: src/tar.c:364 +#: src/tar.c:378 #, fuzzy msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " @@ -1444,16 +1440,17 @@ msgid "" " tar -tvf archive.tar # List all files in archive.tar verbosely.\n" " tar -xf archive.tar # Extract all files from archive.tar.\n" msgstr "" -"\n" -"Uso: %s [OPÇÃO]... [ARQUIVO]...\n" +"GNU `tar' salva vários arquivos juntos em uma única fita ou arquivo-tar no " +"disco, e pode restaurar arquivos individuais a partir do arquivo-tar.\n" "\n" "Exemplos:\n" " %s -cf arquivo.tar foo bar # Cria arquivo.tar através dos arquivos foo e " "bar.\n" -" %s -tvf arquivo.tar # Lista todos os arquivos em arquivo.tar.\n" -" %s -xf arquivo.tar # Extrai todos os arquivos de arquivo.tar\n" +" %s -tvf arquivo.tar # Lista todos os arquivos em arquivo.tar em " +"modo verboso.\n" +" %s -xf arquivo.tar # Extrai todos os arquivos de arquivo.tar.\n" -#: src/tar.c:373 +#: src/tar.c:387 #, fuzzy msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1465,90 +1462,88 @@ msgid "" " nil, existing numbered if numbered backups exist, simple otherwise\n" " never, simple always make simple backups\n" msgstr "" -"\n" "Sufixo do backup é `~', a menos que usado --suffix ou SIMPLE_BACKUP_SUFFIX.\n" -"Os controles de versão que podem ser usados com --backup ou " -"VERSION_CONTROL,\n" -"são:\n" +"O controle de versão pode ser usado com --backup ou VERSION_CONTROL, os " +"valores são:\n" "\n" +" none, off nunca fazer backups\n" " t, numbered faz backups numerados\n" " nil, existing numera se existe backup numerado, se não faz simples\n" " never, simple sempre faz backups simples\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "Modo de operação principal:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "lista os conteúdos de um registro de arquivos" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "extrai arquivos de um registro de arquivos" -#: src/tar.c:411 -#, fuzzy +#: src/tar.c:425 msgid "create a new archive" -msgstr "Final-de-arquivo inesperado no arquivo-tar" +msgstr "cria um novo arquivo-tar" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "acha diferenças entre um registro de arquivos e o sistema de arquivos" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "anexa arquivos ao final de um registro de arquivos" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "anexar apenas arquivos mais novos que a cópia em arquivo" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "anexar arquivos tar a um arquivo" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "apague do arquivo (não em fitas magnéticas!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "teste o rótulo de volume do arquivo e saia" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "Modificadores de operação:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "trata arquivos esparsos eficientemente" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "PRINCIPAL[.SECUNDÁRIO]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "define versão do formato esparso a ser usado (implica --esparso)" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "trata formato-GNU de backup incremental antigo" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "trata formato-GNU de backup incremental novo" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "nível dump para recém criado registro incremental-listado" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "não sai com nonzero em arquivos ilegíveis" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1560,134 +1555,141 @@ msgstr "" "--extract ou --list e quando a lista de arquivos é dada tanto por linha de " "comando com pela opção -T; NUMBER é 1 por padrão" -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "registro é procurável" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "registro não é procurável" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "não checa números de dispositos quando criando registros incrementais" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" "checa números de dispositos quando criando registros incrementais (padrão)" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "Sobreescreve controle:" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "tenta verificar o registro após escrevê-lo" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "remove arquivos após adicioná-los ao registro" -#: src/tar.c:471 +#: src/tar.c:485 #, fuzzy msgid "don't replace existing files when extracting, treat them as errors" msgstr "não substitui arquivos existentes durante extração" -#: src/tar.c:474 +#: src/tar.c:488 #, fuzzy msgid "don't replace existing files when extracting, silently skip over them" msgstr "não substitui arquivos existentes durante extração" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "" "não substitui arquivos existentes que sejam mais novos que suas cópias em " "registro" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "sobreescreve arquivos existentes durante extração" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "remove cada arquivo antes de extrair sobre ele" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "esvazia hierarquias antes de extrair diretório" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "preserva metadados de diretórios existentes" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "sobreescreve metadado de diretório existente ao extrair (padrão)" -#: src/tar.c:490 +#: src/tar.c:504 #, fuzzy msgid "preserve existing symlinks to directories when extracting" msgstr "sobreescreve arquivos existentes durante extração" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "DIR" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "Seleciona fluxo de saída:" -#: src/tar.c:499 -#, fuzzy +#: src/tar.c:516 msgid "extract files to standard output" -msgstr "Erro ao escrever para saída padrão" +msgstr "extrai arquivos para saída padrão" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "COMMAND" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "pipe extraiu arquivos para outro programa" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "ignora código de saída de filhos" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "trata código de saída non-zero de filhos como erro" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Tratando de atributos de arquivo:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "força NOME como dono para arquivos adicionados" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "força NOME como grupo para arquivos adicionados" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "DATA-OU-ARQ" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "seta mtime para arquivos adicionados de DATA-OU-ARQ" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "CHANGES" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "força (simbolicamente) modo CHANGES para arquivos adicionados" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "METHOD" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " @@ -1697,11 +1699,11 @@ msgstr "" "tempos após leitura (METHOD='replace'; padrão) quanto por não setar os " "tempos em primeiro lugar (METHOD='system')" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "não extrai o arquivo tempo modificado" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" @@ -1709,296 +1711,297 @@ msgstr "" "tenta extrair arquivos com mesmo tipo de propriedade como existente em " "registro de arquivos (padrão para superusuário)" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "extrai arquivos como você mesmo (padrão para usuários comuns)" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "sempre usar números para nomes de usuário/grupo" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" "extrai informação sobre permissões de arquivos (padrão para superusuário)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "o mesmo para ambos -p e -s" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "cancela o efeito da opção --delay-directory-restore" -#: src/tar.c:554 +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 #, fuzzy msgid "Handling of extended file attributes:" msgstr "Tratando de atributos de arquivo:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" msgstr "" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" msgstr "" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" msgstr "" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" msgstr "" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" msgstr "" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" msgstr "" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" msgstr "" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" msgstr "" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "Seleção e troca de dispositivo" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ARCHIVE" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "use registro de arquivos ou dispositivo ARCHIVE" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "arquivo do registro é local mesmo se tiver dois pontos" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "use COMMAND rmt dado ao invés de rmt" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "use COMMAND remoto ao invés de rsh" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "especifique drive e densidade" -#: src/tar.c:603 -#, fuzzy +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" -msgstr "Impossível verificar arquivos-tar multi-volume" +msgstr "criar/listar/extrair arquivo-tar multivolume" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "troque a fita após escrever NUMBER x 1024 bytes" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "rode o script no final de cada fita (implica -M)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "use/atualize o número do volume no ARQ" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "Dispositivo bloqueando:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "BLOCKS" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "BLOCKS x 512 bytes por gravação" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "NUMBER de bytes por gravação, multiplo de 512" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:629 -#, fuzzy +#: src/tar.c:653 msgid "Archive format selection:" -msgstr "Opções de formato do arquivo-tar conflitantes" +msgstr "Seleção do formato de arquivo-tar:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "FORMAT" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "cria registro de arquivos no formato dado" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "FORMAT é um dos seguintes:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "formato V7 tar velho" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "o mesmo que pax" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "equivalente a --format=v7" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "equivalente a --format=posix" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "palavra-chave[[:]=valor][,palavra-chave[[:]=valor]]..." -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "controle palavra-chave pax" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "TEXT" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:660 -#, fuzzy +#: src/tar.c:684 msgid "Compression options:" -msgstr "Opções de compressão conflitantes" +msgstr "Opções de compressão:" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "" "usa terminação do registro de arquivos para determinar o programa compressor" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "" "não usa terminação do registro de arquivos para determinar o programa " "compressor" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "PROG" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "filtra através de PROG (deve aceitar -d)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "Seleção de arquivo local:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" "adiciona ARQ dado ao registro de arquivos (útil se seu nome inicia-se com um " "travessão)" -#: src/tar.c:687 -msgid "DIR" -msgstr "DIR" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "muda para o diretório DIR" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "pega nomes para extrair ou criar a partir de ARQ" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "-T lê nomes de terminação nula, desabilita -C" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +msgid "unquote input file or member names (default)" msgstr "" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +msgid "do not unquote input file or member names" msgstr "" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "PADRÂO" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "exclua arquivos, dado como um PADRÂO" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "exclua padrões listados em ARQ" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -2006,189 +2009,203 @@ msgstr "" "exclua conteúdos de diretórios contendo CACHEDIR.TAG, exceto para a própria " "etiqueta de arquivo" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "exclui conteúdo dos diretórios contendo ARQ, exceto o próprio ARQ" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "exclui tudo dentro dos diretórios contendo ARQ" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "exclui diretórios contendo ARQ" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "" "permanece no sistema local de arquivos durante criação de registro de " "arquivos" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:729 +#: src/tar.c:761 #, fuzzy msgid "don't strip leading '/'s from file names" -msgstr "Removendo `%.*s' inicial dos nomes dos membros" +msgstr "preservar `/'s iniciais nos nomes dos arquivos" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "MEMBER-NAME" -#: src/tar.c:735 +#: src/tar.c:767 msgid "begin at member MEMBER-NAME when reading the archive" msgstr "" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "armazena apenas arquivos mais novos que DATA-OU-ARQ" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "DATA" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "compara data e hora apenas quando so dados mudarem" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "CONTROLE" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "efetua backup antes da remoção, escolhe versão CONTROLE" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "STRING" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "Transformações de nome de arquivo:" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "EXPRESSION" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "" -#: src/tar.c:767 +#: src/tar.c:799 msgid "patterns match after any '/' (default for exclusion)" msgstr "" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "" -#: src/tar.c:775 +#: src/tar.c:807 #, fuzzy msgid "wildcards do not match '/'" -msgstr "O volume %s não casa com %s" +msgstr "coringas não casam com `/'" -#: src/tar.c:777 +#: src/tar.c:809 msgid "wildcards match '/' (default for exclusion)" msgstr "" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Prestação de informações:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "KEYWORD" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "aviso de controle" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "exibe mensagens de progresso a cada NUMBERésima gravação (padrão 10)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "ACTION" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "Executa ACTION em cada checkpoint" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "SIGNAL" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2196,414 +2213,406 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:802 +#: src/tar.c:834 msgid "print file modification times in UTC" msgstr "imprime tempos de modificação de arquivo em UTC" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "imprime tempo de arquivo em sua resolução máxima" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "mostra padrões do tar" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "STYLE" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "Outras opções:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "desabilitar o uso de alguma opção potencialmente nociva" -#: src/tar.c:978 +#: src/tar.c:1010 #, fuzzy msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" -msgstr "Não é possível especificar mais do que uma das opções \"-Acdtrux\"" +msgstr "" +"Não é possível especificar mais do que uma das opções `-Acdtrux' ou `--test-" +"label'" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Opções de compressão conflitantes" -#: src/tar.c:1047 -#, fuzzy, c-format +#: src/tar.c:1079 +#, c-format msgid "Unknown signal name: %s" -msgstr " tipo de arquivo \"%s\" desconhecido\n" +msgstr "Nome de sinal desconhecido: %s" -#: src/tar.c:1071 -#, fuzzy +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "Arquivo de datas não encontrado" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Substituindo %s pelo formato de data desconhecido %s" -#: src/tar.c:1108 +#: src/tar.c:1140 #, fuzzy, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "Opção %s: Tratando data `%s' como %s" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1295 +#: src/tar.c:1330 #, fuzzy msgid "Invalid owner or group ID" msgstr "Dono inválido" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Fator de blocagem inválido" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "Tamanho da fita inválido" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "Mais do que uma data limite" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Modo inválido informado na opção" -#: src/tar.c:1858 -#, fuzzy +#: src/tar.c:1925 msgid "Invalid number" -msgstr "Número de inode inválido" +msgstr "Número inválido" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Tamanho de registro inválido" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "O tamanho dos registros tem que ser múltiplo de %d." -#: src/tar.c:1975 -#, fuzzy +#: src/tar.c:2042 msgid "Invalid number of elements" -msgstr "Tamanho da fita inválido" +msgstr "Número de elementos inválido" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "Somente uma opção --to-command permitida" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:2133 +#: src/tar.c:2205 #, fuzzy, c-format msgid "Unknown density: '%c'" msgstr "Densidade desconhecida: `%c'" -#: src/tar.c:2150 +#: src/tar.c:2222 #, fuzzy, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "As opções \"-[0-7][lmh]\" não são suportadas por *este* tar" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[ARQ]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 +#, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "Padrão %s não pode ser usado" + +#: src/tar.c:2389 #, fuzzy, c-format msgid "Old option '%c' requires an argument." msgstr "A opção antiga `%c' exige um argumento." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2389 -#, c-format -msgid "--occurrence cannot be used with %s" -msgstr "" - -#: src/tar.c:2408 +#: src/tar.c:2490 #, fuzzy msgid "Multiple archive files require '-M' option" -msgstr "Múltiplos arquivos-tar é exigem a opção \"-M\"" - -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "Impossivel combinar --listed-incremental com --newer" +msgstr "Múltiplos arquivos-tar exigem a opção `-M'" -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "" -#: src/tar.c:2433 -#, fuzzy, c-format +#: src/tar.c:2515 +#, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" -msgstr[0] "%s: O rótulo do volume é longo demais (o limite é %lu bytes)" -msgstr[1] "%s: O rótulo do volume é longo demais (o limite é %lu bytes)" +msgstr[0] "%s: O rótulo do volume é longo demais (o limite é %lu byte)" +msgstr[1] "%s: O rótulo do volume é longo demais (o limite são %lu bytes)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Impossível verificar arquivos-tar multi-volume" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Impossível verificar arquivos-tar compactados" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "Padrão %s não pode ser usado" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Impossível usar arquivos-tar compactados multi-volume" -#: src/tar.c:2461 -#, fuzzy +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" -msgstr "Impossível atualizar arquivos-tar compactados" +msgstr "Impossível concatenar arquivos-tar comprimidos" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2478 +#: src/tar.c:2560 msgid "--acls can be used only on POSIX archives" msgstr "" -#: src/tar.c:2483 +#: src/tar.c:2565 msgid "--selinux can be used only on POSIX archives" msgstr "" -#: src/tar.c:2488 +#: src/tar.c:2570 msgid "--xattrs can be used only on POSIX archives" msgstr "" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "Padrão %s não pode ser usado" - -#: src/tar.c:2525 -msgid "Volume length cannot be less than record size" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" msgstr "" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" +#: src/tar.c:2630 +msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "Recusando a criar um arquivo-tar vazio" -#: src/tar.c:2565 +#: src/tar.c:2669 #, fuzzy msgid "Options '-Aru' are incompatible with '-f -'" msgstr "As opções `-Aru' são incompatíveis com `-f -'" -#: src/tar.c:2660 +#: src/tar.c:2766 #, fuzzy msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" -msgstr "Deve ser especificada uma das opções \"-Acdtrux\"" +msgstr "Deve ser especificada uma das opções `-Acdtrux' ou `--test-label'" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 -#, fuzzy, c-format +#, c-format msgid "%s: File shrank by %s byte" msgid_plural "%s: File shrank by %s bytes" -msgstr[0] "%s: O arquivo encolheu %s bytes" +msgstr[0] "%s: O arquivo encolheu %s byte" msgstr[1] "%s: O arquivo encolheu %s bytes" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "Palavra-chave %s não é conhecida ou ainda não está implementada" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" msgstr "Carimbo de horário fora da faixa permitida" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "Padrão %s não pode ser usado" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Palavra-chave %s não pod ser sobrescrita" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "Cabeçalho estendido malformado: falta o comprimento" -#: src/xheader.c:676 -#, fuzzy, c-format +#: src/xheader.c:677 +#, c-format msgid "Extended header length %*s is out of range" -msgstr "A string base-64 assinada do arquivo-tar %s está fora de faixa %s" +msgstr "O comprimento do cabeçalho estendido %*s está fora da faixa" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "Cabeçalho estendido malformado: falta espaço após o comprimento" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "Cabeçalho estendido malformado: falta sinal de igual" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "Cabeçalho estendido malformado: falta nova-linha" -#: src/xheader.c:740 +#: src/xheader.c:741 #, fuzzy, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "Ignorando chave `%s' desconhecida do cabeçalho estendido" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "Par de chave/valor gerado é muito longo (chave=%s, tamanho=%s)" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "Cabeçalho estendido %s=%s está fora da faixa %s..%s" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Cabeçalho estendido malformado: %s=%s inválido" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Cabeçalho estendido malformado: excesso %s=%s" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "Cabeçalho estendido malformado: %s inválido: delimitador %c inesperado" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "Cabeçalho estendido malformado: %s inválido: número par de valores" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "%s: não é um limite de tempo válido" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "%s: ação do ponto de verificação desconhecida" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "escreva" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "leia" @@ -2611,7 +2620,7 @@ msgstr "leia" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "Ponto de verificação de escrita %u" @@ -2620,7 +2629,7 @@ msgstr "Ponto de verifica #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "Ponto de verificação de leitura %u" @@ -2635,9 +2644,8 @@ msgstr "" "OPÇÕES são:\n" #: tests/genfile.c:127 -#, fuzzy msgid "File creation options:" -msgstr "Opções de compressão conflitantes" +msgstr "Opções de criação do arquivo:" #: tests/genfile.c:128 tests/genfile.c:139 msgid "SIZE" @@ -2784,7 +2792,7 @@ msgid "Error parsing number near `%s'" msgstr "Erro ao analise o número próximo de `%s'" #: tests/genfile.c:367 -#, fuzzy, c-format +#, c-format msgid "Unknown date format" msgstr "Formato de data desconhecido" @@ -2799,9 +2807,8 @@ msgid "cannot open `%s'" msgstr "`%s' não pode ser aberto" #: tests/genfile.c:434 -#, fuzzy msgid "cannot seek" -msgstr "Impossível fechar" +msgstr "Impossível saltar" #: tests/genfile.c:451 #, c-format @@ -2849,9 +2856,9 @@ msgid "Command exited successfully\n" msgstr "Comando terminou com sucesso\n" #: tests/genfile.c:835 -#, fuzzy, c-format +#, c-format msgid "Command failed with status %d\n" -msgstr "O processo filho morreu com o sinal %d" +msgstr "Comando falhou com o sinal %d\n" #: tests/genfile.c:839 #, c-format @@ -2878,13 +2885,12 @@ msgstr "Comando terminado\n" msgid "--stat requires file names" msgstr "--stat exige nomes de arquivos" -#, fuzzy -#~ msgid "Cannot get working directory" -#~ msgstr "Impossível mudar o diretório de trabalho" - #~ msgid "sort names to extract to match archive" #~ msgstr "ordena nome para extração para casar com registro de arquivos" +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "Impossivel combinar --listed-incremental com --newer" + #~ msgid "Field too long while reading snapshot file" #~ msgstr "Campo muito longo durante leitura de arquivo instantâneo" @@ -2894,9 +2900,11 @@ msgstr "--stat exige nomes de arquivos" #~ msgid "Unexpected field value in snapshot file" #~ msgstr "Campo com valor inesperado em arquivo instantâneo" -#, fuzzy +#~ msgid "Cannot get working directory" +#~ msgstr "Impossível detectar o diretório de trabalho" + #~ msgid "Invalid group" -#~ msgstr "%s: Grupo inválido" +#~ msgstr "Grupo inválido" #~ msgid "Extended header length is out of allowed range" #~ msgstr "Comprimento do cabeçalho estendido está fora da faixa permitida" diff --git a/po/ro.gmo b/po/ro.gmo index 6257e34..bfd975b 100644 Binary files a/po/ro.gmo and b/po/ro.gmo differ diff --git a/po/ro.po b/po/ro.po index 76ead35..0304783 100644 --- a/po/ro.po +++ b/po/ro.po @@ -3,12 +3,12 @@ # Laurentiu Buzdugan >, 2005. # # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" "Project-Id-Version: tar 1.15.1\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" "PO-Revision-Date: 2005-07-15 12:00-0500\n" "Last-Translator: Laurentiu Buzdugan \n" "Language-Team: Romanian \n" @@ -102,7 +102,7 @@ msgstr "Afi msgid "give a short usage message" msgstr "Afiºeazã un scurt mesaj despre folosire" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "NUME" @@ -391,9 +391,7 @@ msgstr "Raporta #: gnu/version-etc.c:249 #, fuzzy, c-format msgid "Report %s bugs to: %s\n" -msgstr "" -"\n" -"Raportaþi bug-uri la <%s>.\n" +msgstr "Raportaþi bug-uri la %s.\n" #: gnu/version-etc.c:253 #, c-format @@ -413,7 +411,7 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: Nu pot %s" @@ -422,56 +420,56 @@ msgstr "%s: Nu pot %s" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: Avertisment: Nu pot %s" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: Nu pot schimba modul ca %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: Nu pot schimba proprietatea cãtre uid %lu, gid %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: Nu pot crea hard link cãtre %s" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, fuzzy, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Eroare citire la octet %s, citind %lu octet" msgstr[1] "%s: Eroare citire la octet %s, citind %lu octeþi" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, fuzzy, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Avertisment: Eroare citire la octet %s, citind %lu octet" msgstr[1] "%s: Avertisment: Eroare citire la octet %s, citind %lu octeþi" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: Nu pot cãuta (seek) cãtre %s" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: Avertisment: Nu pot cãuta (seek) cãtre %s" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: Nu pot crea symlink cãtre %s" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -571,14 +569,20 @@ msgstr "" #: rmt/rmt.c:664 #, fuzzy msgid "Unexpected arguments" -msgstr "EOF neaºteptat în arhivã" +msgstr "EOF neaºteptat în numele amestecate" #: rmt/rmt.c:689 +#, fuzzy msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "" +"Folosire: %s [OPÞIUNE]\n" +"Manipuleazã o unitate de bandã, acceptând comenzi de la un proces remote.\n" +"\n" +" --version Afiºeazã informaþii versiune.\n" +" --help Afiºeazã acest mesaj.\n" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "NUMÃR" @@ -586,10 +590,10 @@ msgstr "NUM msgid "set debug level" msgstr "" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "FIªIER" @@ -598,9 +602,9 @@ msgid "set debug output file name" msgstr "" #: rmt/rmt.c:715 rmt/rmt.c:783 -#, fuzzy, c-format +#, c-format msgid "cannot open %s" -msgstr "%s: Nu pot cãuta (seek) cãtre %s" +msgstr "" #: rmt/rmt.c:780 tests/genfile.c:892 tests/genfile.c:909 #, c-format @@ -611,105 +615,113 @@ msgstr "" msgid "Garbage command" msgstr "Comandã gunoi" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Aceasta nu pare a fi o arhivã tar" -#: src/buffer.c:521 src/buffer.c:530 +#: src/buffer.c:574 +msgid "Total bytes read" +msgstr "" + +#: src/buffer.c:576 #, fuzzy msgid "Total bytes written" msgstr "Numãr total octeþi scriºi: %s (%s, %s/s)\n" -#: src/buffer.c:528 src/buffer.c:542 -msgid "Total bytes read" -msgstr "" - -#: src/buffer.c:532 -#, fuzzy, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Numãr total octeþi scriºi: %s (%s, %s/s)\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(pipe)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "Valoare invalidã pentru record_size" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Nume arhivã nu a fost furnizat" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Nu pot verifica arhive atdin/stdout" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Arhiva este compresatã. Folosiþi opþiunea %s." -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Nu pot actualiza arhive comprimate" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "La începutul benzii, ieºim acum" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "Prea multe erori, ieºim" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Dimensiune înregistrare = %lu bloc" msgstr[1] "Dimensiune înregistrare = %lu blocuri" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "Bloc ne-aliniat (%lu octet) în arhivã" msgstr[1] "Bloc ne-aliniat (%lu octeþi) în arhivã" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" "Nu pot backspace fiºierul arhivã; acesta ar putea fi de necitit fãrã -i" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek nu s-a oprit la limita unei înregistrãri" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: conþine numãr volum invalid" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "Depãºire domeniu numãr volum" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Preparã volum #%d pentru %s ºi apasã tasta return: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "EOF unde era aºteptat rãspunsul utilizatorului" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "AVERTISMENT: Arhiva este incompletã" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -721,72 +733,72 @@ msgstr "" " ! Lanseazã un subshell\n" " ? Afiºeazã aceastã listã de opþiuni\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Nici un volum nou; terminãm.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, fuzzy, c-format msgid "%s command failed" msgstr "`%s' comanda a eºuat" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, fuzzy, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s nu este continuat pe acest volum" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s nu este continuat pe acest volum" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s este de dimensiune greºitã (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Acest volum este în afara secvenþei" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "Arhiva nu este etichetatã sã se potriveascã cu %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "Volumul %s nu se potriveºte cu %s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, fuzzy, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" "%s: nume fiºier prea lung pentru a fi storat într-un antet GNU multivolum" -#: src/buffer.c:1866 +#: src/buffer.c:1917 #, fuzzy msgid "write did not end on a block boundary" msgstr "rmtlseek nu s-a oprit la limita unei înregistrãri" @@ -798,16 +810,16 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Am putut citi doar %lu din %lu octet" msgstr[1] "Am putut citi doar %lu din %lu octeþi" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "Conþinuturile diferã" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "EOF neaºteptat în arhivã" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "Tipul fiºierelor diferã" @@ -827,7 +839,7 @@ msgstr "Gid difer msgid "Mod time differs" msgstr "Timp modificare diferã" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Dimensiunea diferã" @@ -844,38 +856,38 @@ msgstr "Symlink difer msgid "Device number differs" msgstr "Numãr dispozitiv diferã" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Verificã " -#: src/compare.c:471 -#, fuzzy, c-format +#: src/compare.c:473 +#, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "" "%s: Tip de fiºier necunoscut '%c', folosesc diff ca pentru un fiºier normal" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "Arhiva conþine nume de fiºiere cu prefixele îndepãrtate." -#: src/compare.c:533 +#: src/compare.c:535 #, fuzzy msgid "Archive contains transformed file names." msgstr "Arhiva conþine antete în baza-64 depãºite" -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "Verificare ar putea eºua sã gãseascã fiºierele originale." -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "VERIFICà EªEC: detectat %d antet invalid" msgstr[1] "VERIFICà EªEC: detectat %d antete invalide" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "Un bloc zero singuratic la %s" @@ -921,56 +933,56 @@ msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "%s: Fiºier scurtat cu %s octet; completat cu zerouri" msgstr[1] "%s: Fiºier scurtat cu %s octeþi; completat cu zerouri" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: fiºierul este pe un sistem de fiºiere diferit; nimic generat" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Tip de fiºier necunoscut; fiºier ignorat" -#: src/create.c:1549 +#: src/create.c:1551 #, fuzzy, c-format msgid "Missing links to %s." msgstr "Link lipsã cãtre '%s'.\n" -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: fiºierul este neschimbat; nimic generat" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: fiºierul este în arhivã; nimic generat" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 #, fuzzy msgid "directory not dumped" msgstr "%s: conþine o etichetã de director cache; nimic generat" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: fiºier schimbat în timp ce îl citeam" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: socket ignorat" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: uºã ignoratã" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Sãrim la urmãtorul antet" @@ -1016,13 +1028,13 @@ msgstr " msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Nu pot extrage -- fiºierul este continuat din altã arhivã" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 #, fuzzy msgid "Unexpected long name header" msgstr "EOF neaºteptat în numele amestecate" #: src/extract.c:1542 -#, fuzzy, c-format +#, c-format msgid "%s: Unknown file type '%c', extracted as normal file" msgstr "%s: Tip de fiºier necunoscut '%c', extras ca fiºier normal" @@ -1061,158 +1073,158 @@ msgstr "%s: fi msgid "%s: Directory has been renamed" msgstr "%s: Directorul a fost redenumit" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "Înregistrare timp invalidã" -#: src/incremen.c:1045 +#: src/incremen.c:1047 #, fuzzy msgid "Invalid modification time" msgstr "Mod invalid furnizat ca opþiune" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "Numãr dispozitiv invalid" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Numãr inode invalid" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" msgstr "" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "EOF neaºteptat în arhivã" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 -#, c-format +#: src/incremen.c:1178 +#, fuzzy, c-format msgid "%s: byte %s: %s %s" -msgstr "" +msgstr "Am citit %s octeþi de la %s" -#: src/incremen.c:1257 -#, c-format +#: src/incremen.c:1259 +#, fuzzy, c-format msgid "%s: byte %s: %s" -msgstr "" +msgstr "Am citit %s octeþi de la %s" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1566 +#: src/incremen.c:1568 #, fuzzy msgid "Malformed dumpdir: empty name in 'R'" msgstr "Argument densitate malformat: '%s'" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1585 +#: src/incremen.c:1587 #, fuzzy msgid "Malformed dumpdir: empty name in 'T'" msgstr "Argument densitate malformat: '%s'" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Nu curãþ director: nu pot determina statistici" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: directorul este pe un dispozitiv (device) diferit; necurãþat" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: ªtergem %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: Nu pot ºterge" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: Omis" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "bloc %s: ** Bloc de NUL-uri **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "bloc %s: ** Sfârºit de fiºier **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "bloc %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Spaþii libere în antet unde valoare %s numericã aºteptatã" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1220,96 +1232,96 @@ msgstr "" "lui doi" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Valoare octalã arhivã %.*s este în afara %s intervalului" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "Arhiva conþine antete în baza-64 depãºite" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "ªir în baza-64 (semnãtura arhivei) %s este în afara %s intervalului" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Valoare baza-256 a arhivei este în afara %s intervalului" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Arhiva conþine %.*s unde valoare %s numericã aºteptatã" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, fuzzy, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Valoare arhivã %s este în afara %s intervalului %s.%s" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " link cãtre %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " tip fiºier necunoscut %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--Link Lung--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--Nume Lung--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Antet Volum--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Continuat la octet %s--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Creez director:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "Redenumesc %s ca %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Nu pot redenumi ca %s" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "Redenumesc %s înapoi ca %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Fiºier ºters înainte de a-l putea citi" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "proces copil" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "canal între-procese" @@ -1319,76 +1331,75 @@ msgid "command line" msgstr "`%s' comanda a eºuat" #: src/names.c:378 -#, fuzzy, c-format +#, c-format msgid "%s: file list requested from %s already read from %s" -msgstr "%s: fiºierul este în arhivã; nimic generat" +msgstr "" -#: src/names.c:448 -#, fuzzy, c-format +#: src/names.c:448 src/checkpoint.c:274 +#, c-format msgid "cannot split string '%s': %s" -msgstr "%s: Nu pot cãuta (seek) cãtre %s" +msgstr "" #: src/names.c:490 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/names.c:821 -#, fuzzy +#: src/names.c:824 msgid "Pattern matching characters used in file names" -msgstr "pattern-urile de excludere potrivesc începutul numelor de fiºiere" +msgstr "" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: Nu a fost gãsit în arhivã" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Lucrul cerut nu a fost gãsit în arhivã" -#: src/names.c:876 +#: src/names.c:879 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "Arhiva nu este etichetatã sã se potriveascã cu %s" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "Opþiunile `-%s' ºi `-%s' vor amândouã intrarea standard" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s: Format arhivã invalid" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "Capabilitãþi GNU cerute pentru un format de arhivã incompatibil" -#: src/tar.c:255 +#: src/tar.c:264 #, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." msgstr "" -#: src/tar.c:364 +#: src/tar.c:378 #, fuzzy msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " @@ -1416,7 +1427,7 @@ msgstr "" " nil, existing numeroteazã dacã existã backup numerotat, altfel simplu\n" " never, simple întotdeauna creazã backup simplu\n" -#: src/tar.c:373 +#: src/tar.c:387 #, fuzzy msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1445,79 +1456,79 @@ msgstr "" " nil, existing numeroteazã dacã existã backup numerotat, altfel simplu\n" " never, simple întotdeauna creazã backup simplu\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "Mod de operare principal:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "listeazã conþinutul unei arhive" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "extrage fiºiere dintr-o arhivã" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "creazã o nouã arhivã" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "gãseºte diferenþele dintre arhive ºi sistemul de fiºiere" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "adaugã fiºiere la sfârºitul unei arhive" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "adaugã numai fiºierele mai noi decât copia din arhivã" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "adaugã fiºiere tar la o arhivã" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "ºterge din arhivã (nu pe benzi magnetice!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "Modificatori operaþie:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "manipuleazã eficient fiºierele rerefiate (sparse)" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "foloseºte vechiul format GNU pentru backup incremental" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "foloseºte noul format GNU pentru backup incremental" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "nu termina cu non-zero pentru fiºiere ce nu pot fi citite" -#: src/tar.c:445 +#: src/tar.c:459 #, fuzzy msgid "" "process only the NUMBERth occurrence of each file in the archive; this " @@ -1530,367 +1541,383 @@ msgstr "" "--diff, --extract sau --list ºi când o listã de fiºiere este datã fie în " "linia de comandã sau folosind opþiunea -T. Implicit, NUMBER=1." -#: src/tar.c:451 +#: src/tar.c:465 #, fuzzy msgid "archive is seekable" msgstr "Arhiva este cãutabilã" -#: src/tar.c:453 +#: src/tar.c:467 #, fuzzy msgid "archive is not seekable" msgstr "Arhiva este cãutabilã" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "încearcã sã verifici arhiva dupã scrierea sa" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "ºterge fiºierele dupã ce acestea sunt adãugate la arhivã" -#: src/tar.c:471 +#: src/tar.c:485 #, fuzzy msgid "don't replace existing files when extracting, treat them as errors" msgstr "nu înlocui fiºierele existente la extragere" -#: src/tar.c:474 +#: src/tar.c:488 #, fuzzy msgid "don't replace existing files when extracting, silently skip over them" msgstr "nu înlocui fiºierele existente la extragere" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "" "nu înlocui fiºierele existente care sunt mai noi decât copiile acestora din " "arhivã" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "supra-scrie fiºierele existente la extragere" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "ºterge fiecare fiºier înainte de a extrage peste acesta" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "goleºte ierarhiile înainte de a extrage un director" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "pãstrazã metadata directoarelor existente" -#: src/tar.c:487 +#: src/tar.c:501 #, fuzzy msgid "overwrite metadata of existing directories when extracting (default)" msgstr "supra-scrie fiºierele existente la extragere" -#: src/tar.c:490 +#: src/tar.c:504 #, fuzzy msgid "preserve existing symlinks to directories when extracting" msgstr "supra-scrie fiºierele existente la extragere" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "DIR" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "extrage fiºierele la ieºirea standard" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "COMANDÃ" -#: src/tar.c:501 +#: src/tar.c:518 #, fuzzy msgid "pipe extracted files to another program" msgstr "extrage fiºierele la ieºirea standard" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Manipulare atribute fiºiere:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "forþeazã NUME ca proprietar pentru fiºierele adãugate" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "forþeazã NUME ca grup pentru fiºierele adãugate" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "DATA-FIªIERULUI" -#: src/tar.c:517 +#: src/tar.c:534 #, fuzzy msgid "set mtime for added files from DATE-OR-FILE" msgstr "stocheazã numai fiºiere mai noi decât DATA-FIªIERULUI" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "SCHIMBÃRI" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "forþeazã mod (simbolic) SCHIMBÃRI pentru fiºierele adãugate" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " "place (METHOD='system')" msgstr "" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "nu extrage timpul de modificare al fiºierului" -#: src/tar.c:528 +#: src/tar.c:545 #, fuzzy msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" msgstr "încearcã extragerea fiºierelor cu aceleaºi drepturi (ownership)" -#: src/tar.c:530 +#: src/tar.c:547 #, fuzzy msgid "extract files as yourself (default for ordinary users)" msgstr "extrage fiºierele ca dvs. însuºi" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "foloseºte întotdeauna numere pentru numele utilizator/grup" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "la fel ca -p ºi -s" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:554 +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 #, fuzzy msgid "Handling of extended file attributes:" msgstr "Manipulare atribute fiºiere:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" msgstr "" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" msgstr "" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" msgstr "" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" msgstr "" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" msgstr "" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" msgstr "" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" msgstr "" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" msgstr "" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "Selectare ºi schimbare unitate:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ARHIVÃ" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "foloseºte fiºier arhivã sau unitate ARHIVÃ" -#: src/tar.c:581 +#: src/tar.c:605 #, fuzzy msgid "archive file is local even if it has a colon" msgstr "fiºier arhivã este local chiar când are un :" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "foloseºte rmt COMANDà în loc de rmt" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "foloseºte remote COMANDà în loc de rsh" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "specificã unitate ºi densitate" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "creazã/listeazã/extrage arhiva pe volume multiple" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "schimbã banda dupã scriere a NUMÃR x 1024 octeþi" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "ruleazã script la terminarea fiecãrei benzi (implicã -M)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "foloseºte/actualizeazã numãrul de volum în FIªIER" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "Blocuri unitate:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "BLOCURI" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "BLOCURI x 512 octeþi pe întregistrare" -#: src/tar.c:620 +#: src/tar.c:644 #, fuzzy msgid "NUMBER of bytes per record, multiple of 512" msgstr "DIMENSIUNE octeþi pe înregistrare, multiplu de 12" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "ignorã blocuri zero-uate în arhivã (înseamnã EOF)" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "redimensioneazã bloc în timpul citirii (pentru pipe-uri BSD4.2" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "Selecþie format arhivã:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "FORMAT" -#: src/tar.c:632 +#: src/tar.c:656 #, fuzzy msgid "create archive of the given format" msgstr "creazã arhiva de formatul dat." -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "FORMAT este unul din urmãtoarele" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "vechiul format tar V7" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "oldgnu formatul GNU format ca pentru tar <= 1.12" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "formatul GNU tar 1.13.x" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "formatul POSIX 1003.1-1988 (ustar)" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "formatul POSIX 1003.1-2001 (pax)" -#: src/tar.c:645 +#: src/tar.c:669 #, fuzzy msgid "same as pax" msgstr "ca ºi pax" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "ca ºi --format=v7" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "ca ºi --format=posix" -#: src/tar.c:652 +#: src/tar.c:676 #, fuzzy msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "cuvânt_cheie[[:]=valoare][,cuvânt_cheie[[:]=valoare], ...]" -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "controleazã cuvintele cheie pax" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "TEXT" -#: src/tar.c:655 +#: src/tar.c:679 #, fuzzy msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " @@ -1899,175 +1926,186 @@ msgstr "" "creazã arhivã nu nume volum NUME. La listare/extragere, foloseºte TEXT ca " "pattern de globbing" -#: src/tar.c:660 +#: src/tar.c:684 #, fuzzy msgid "Compression options:" msgstr "Opþiunile de compresie sunt în conflict" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "PROG" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "filtreazã prin PROG (trebuie sã accepte -d)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "Selecþie fiºier local:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:687 -msgid "DIR" -msgstr "DIR" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "schimbã în directorul DIR" -#: src/tar.c:690 +#: src/tar.c:714 #, fuzzy msgid "get names to extract or create from FILE" msgstr "obþine numele de extras sau creat din fiºierul NUME" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "-T citeºte nume terminate cu null, deactiveazã cu -C" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +msgid "unquote input file or member names (default)" msgstr "" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +msgid "do not unquote input file or member names" msgstr "" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "PATTERN" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "exclude fiºiere, date ca un PATTERN" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "pattern-urile de excludere sunt listate în FIªIER" -#: src/tar.c:704 +#: src/tar.c:728 #, fuzzy msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "exclude directoarele ce conþin o etichetã cache" -#: src/tar.c:707 +#: src/tar.c:731 #, fuzzy msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "exclude directoarele ce conþin o etichetã cache" -#: src/tar.c:710 +#: src/tar.c:734 #, fuzzy msgid "exclude directories containing CACHEDIR.TAG" msgstr "exclude directoarele ce conþin o etichetã cache" -#: src/tar.c:712 +#: src/tar.c:736 #, fuzzy msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "exclude directoarele ce conþin o etichetã cache" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 #, fuzzy msgid "exclude everything under directories containing FILE" msgstr "exclude directoarele ce conþin o etichetã cache" -#: src/tar.c:717 +#: src/tar.c:747 #, fuzzy msgid "exclude directories containing FILE" msgstr "exclude directoarele ce conþin o etichetã cache" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:721 +#: src/tar.c:751 +#, fuzzy +msgid "read exclude patterns from the VCS ignore files" +msgstr "pattern-urile de excludere sunt ºiruri simple" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "evitã coborârea automatã în directoare" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "stai în sistemul de fiºire local la creare arhivei" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "coboarã recursiv în directoare (implicit)" -#: src/tar.c:729 +#: src/tar.c:761 #, fuzzy msgid "don't strip leading '/'s from file names" msgstr "nu elimina primul `/' din numele fiºierelor" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "NUME-MEMBRU" -#: src/tar.c:735 +#: src/tar.c:767 #, fuzzy msgid "begin at member MEMBER-NAME when reading the archive" msgstr "începe la membrul NUME-MEMBRU în arhivã" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "stocheazã numai fiºiere mai noi decât DATA-FIªIERULUI" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "DATA" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "comparã data ºi timpul numai când a fost schimbatã data" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "CONTROL" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "fã backup înainte de ºtergere, alege CONTROL pentru versiuni" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "ªIR" -#: src/tar.c:744 +#: src/tar.c:776 #, fuzzy msgid "" "backup before removal, override usual suffix ('~' unless overridden by " @@ -2076,103 +2114,103 @@ msgstr "" "fã backup înainte de ºtergere, înlocuieºte prefixul normal ('~' în afarã de " "cazul când este determinat de variabila de mediu SIMPLE_BACKUP_SUFFIX" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "" -#: src/tar.c:751 +#: src/tar.c:783 #, fuzzy msgid "strip NUMBER leading components from file names on extraction" msgstr "eliminã NUMÃR componente de la începutul numelor fiºierelor" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:763 +#: src/tar.c:795 #, fuzzy msgid "ignore case" msgstr "în excluderi ignorã cazul caracterelor (minuscule/majuscule)" -#: src/tar.c:765 +#: src/tar.c:797 #, fuzzy msgid "patterns match file name start" msgstr "pattern-urile de excludere potrivesc începutul numelor de fiºiere" -#: src/tar.c:767 +#: src/tar.c:799 #, fuzzy msgid "patterns match after any '/' (default for exclusion)" msgstr "pattern-urile de excludere potrivesc dupã orice / (implicit)" -#: src/tar.c:769 +#: src/tar.c:801 #, fuzzy msgid "case sensitive matching (default)" msgstr "excluderea depinde de caz (minuscule/majuscule) (implicit)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "" -#: src/tar.c:775 +#: src/tar.c:807 #, fuzzy msgid "wildcards do not match '/'" msgstr "wildcard-urile în pattern-urile de excludere nu potrivesc '/'" -#: src/tar.c:777 +#: src/tar.c:809 #, fuzzy msgid "wildcards match '/' (default for exclusion)" msgstr "wildcard-urile din pattern-urile de excludere potrivesc '/' (implicit)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Ieºire informativã:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "listeazã cu amãnunte fiºierele procesate" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "" -#: src/tar.c:789 +#: src/tar.c:821 #, fuzzy msgid "display progress messages every NUMBERth record (default 10)" msgstr "afiºeazã mesaje despre progres la fiecare al 10-a înregistrare" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "afiºeazã un mesaj dacã nu toate link-urile sunt prelucrate" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2180,37 +2218,37 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:802 +#: src/tar.c:834 #, fuzzy msgid "print file modification times in UTC" msgstr "afiºeazã datele de modificare a fiºierelor în UTC" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "trimite ieºire detaliatã în FIªIER" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "aratã numãrul blocului din arhivã pentru fiecare mesaj" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "cere confirmare pentru fiecare acþiune" -#: src/tar.c:813 +#: src/tar.c:845 #, fuzzy msgid "show tar defaults" msgstr "Aratã valorire implicite folosite de tar" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 +#: src/tar.c:849 #, fuzzy msgid "" "when listing or extracting, list each directory that does not match search " @@ -2219,87 +2257,87 @@ msgstr "" "La listare sau extragere, listeazã fiecare director care nu se potriveºte cu " "criteriile de cãutare" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "Opþiuni compatibilitate:" -#: src/tar.c:835 +#: src/tar.c:867 #, fuzzy msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "la creare, ca ºi --old-archive. La extragere, ca ºi --no-same-owner" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "Alte opþiuni:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:978 +#: src/tar.c:1010 #, fuzzy msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" msgstr "Nu puteþi specifica mai mult de una dintre opþiunile `-Acdtrux'" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Opþiunile de compresie sunt în conflict" -#: src/tar.c:1047 +#: src/tar.c:1079 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr " tip fiºier necunoscut %s\n" -#: src/tar.c:1071 +#: src/tar.c:1103 #, fuzzy msgid "Date sample file not found" msgstr "Fiºier date nu a fost gãsit" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Înlocuim %s pentru format de datã necunoscut %s" -#: src/tar.c:1108 +#: src/tar.c:1140 #, fuzzy, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "Tratez data `%s' ca %s + %ld nanosecundã" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, fuzzy, c-format msgid "filter the archive through %s" msgstr "filtreazã arhiva prin gzip" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2307,198 +2345,192 @@ msgstr "" "\n" "*Acest* tar foloseºte implicit:\n" -#: src/tar.c:1295 +#: src/tar.c:1330 #, fuzzy msgid "Invalid owner or group ID" msgstr "Proprietar invalid" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Factor blocuri invalid" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "Lungime de bandã invalidã" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "Mai mult de o singurã datã limitã" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Mod invalid furnizat ca opþiune" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "Numãr invalid" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Dimensiune înregistrare invalidã" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "Dimensiune înregistrare trebuie sã fie un multiplu de %d." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "Numãr invalid de elemente" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:2107 +#: src/tar.c:2179 #, fuzzy, c-format msgid "Malformed density argument: %s" msgstr "Argument densitate malformat: '%s'" -#: src/tar.c:2133 -#, fuzzy, c-format +#: src/tar.c:2205 +#, c-format msgid "Unknown density: '%c'" msgstr "Densitate necunoscutã: '%c'" -#: src/tar.c:2150 +#: src/tar.c:2222 #, fuzzy, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "Opþiunile `-[0-7][lmh]' nu sunt suportate de *acest* tar" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[FIªIER]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 +#, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "Pattern-ul %s nu poate fi folosit" + +#: src/tar.c:2389 #, fuzzy, c-format msgid "Old option '%c' requires an argument." msgstr "Vechea opþiune `%c' necesitã un argument." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence n-are sens fãrã o listã de fiºiere" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "--occurrence nu poate fi folosit în modul de operare cerut" - -#: src/tar.c:2408 +#: src/tar.c:2490 #, fuzzy msgid "Multiple archive files require '-M' option" msgstr "Fiºiere de arhivã multiple necesitã opþiunea `-M'" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "Nu puteþi combina --listed-incremental cu --newer" - -#: src/tar.c:2416 +#: src/tar.c:2498 #, fuzzy msgid "--level is meaningless without --listed-incremental" msgstr "--occurrence n-are sens fãrã o listã de fiºiere" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "%s: Eticheta volumului este prea lungã (limita este %lu octet)" msgstr[1] "%s: Eticheta volumului este prea lungã (limita este %lu octeþi)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Nu pot verifica arhive pe volume multiple" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Nu pot verifica arhive comprimate" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "Pattern-ul %s nu poate fi folosit" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Nu pot folosi arhive comprimate pe volume multiple" -#: src/tar.c:2461 +#: src/tar.c:2543 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Nu pot actualiza arhive comprimate" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option poate fi folosit numai pentru arhive POSIX" -#: src/tar.c:2478 +#: src/tar.c:2560 #, fuzzy msgid "--acls can be used only on POSIX archives" msgstr "--pax-option poate fi folosit numai pentru arhive POSIX" -#: src/tar.c:2483 +#: src/tar.c:2565 #, fuzzy msgid "--selinux can be used only on POSIX archives" msgstr "--pax-option poate fi folosit numai pentru arhive POSIX" -#: src/tar.c:2488 +#: src/tar.c:2570 #, fuzzy msgid "--xattrs can be used only on POSIX archives" msgstr "--pax-option poate fi folosit numai pentru arhive POSIX" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "Pattern-ul %s nu poate fi folosit" - -#: src/tar.c:2525 -msgid "Volume length cannot be less than record size" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" msgstr "" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" +#: src/tar.c:2630 +msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "Refuz categoric sã creez o arhivã goalã" -#: src/tar.c:2565 +#: src/tar.c:2669 #, fuzzy msgid "Options '-Aru' are incompatible with '-f -'" msgstr "Opþiunile `-Aru' sunt incompatibile cu `-f -'" -#: src/tar.c:2660 +#: src/tar.c:2766 #, fuzzy msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" msgstr "Trebuie sã specificaþi una din opþiunile `-Acdtrux'" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" @@ -2506,102 +2538,102 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: Fiºier scurtat cu %s octet" msgstr[1] "%s: Fiºier scurtat cu %s octeþi" -#: src/xheader.c:164 +#: src/xheader.c:165 #, fuzzy, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "Cuvânt_cheie %s necunoscut sau încã neimplementat" -#: src/xheader.c:173 +#: src/xheader.c:174 #, fuzzy msgid "Time stamp is out of allowed range" msgstr "Înregistrare timp în afara domeniului" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "Pattern-ul %s nu poate fi folosit" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Cuvânt_cheie %s nu poate fi înlocuit (overridden)" -#: src/xheader.c:667 +#: src/xheader.c:668 #, fuzzy msgid "Malformed extended header: missing length" msgstr "Antet extins malformat: lipseºte semnul egal" -#: src/xheader.c:676 +#: src/xheader.c:677 #, fuzzy, c-format msgid "Extended header length %*s is out of range" msgstr "ªir în baza-64 (semnãtura arhivei) %s este în afara %s intervalului" -#: src/xheader.c:688 +#: src/xheader.c:689 #, fuzzy msgid "Malformed extended header: missing blank after length" msgstr "Antet extins malformat: lipseºte spaþiu liber dupã lungime" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "Antet extins malformat: lipseºte semnul egal" -#: src/xheader.c:702 +#: src/xheader.c:703 #, fuzzy msgid "Malformed extended header: missing newline" msgstr "Antet extins malformat: lipseºte semnul egal" -#: src/xheader.c:740 +#: src/xheader.c:741 #, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, fuzzy, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "Valoare arhivã %s este în afara %s intervalului %s.%s" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, fuzzy, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Antet extins malformat: lipseºte semnul egal" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, fuzzy, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Antet extins malformat: lipseºte semnul egal" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, fuzzy, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "Antet extins malformat: lipseºte semnul egal" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, fuzzy, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "Antet extins malformat: lipseºte semnul egal" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, fuzzy, c-format msgid "%s: not a valid timeout" msgstr "%s: Grup invalid" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "" @@ -2609,7 +2641,7 @@ msgstr "" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, fuzzy, c-format msgid "Write checkpoint %u" msgstr "Scrie punct de verificare %d" @@ -2618,7 +2650,7 @@ msgstr "Scrie punct de verificare %d" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, fuzzy, c-format msgid "Read checkpoint %u" msgstr "Citeºte punct de verificare %d" @@ -2826,7 +2858,7 @@ msgstr "%s: Nu pot c #: tests/genfile.c:692 #, fuzzy, c-format msgid "cannot truncate `%s'" -msgstr "%s: Nu pot cãuta (seek) cãtre %s" +msgstr "%s: Nu pot redenumi ca %s" #: tests/genfile.c:701 #, fuzzy, c-format @@ -2836,7 +2868,7 @@ msgstr "`%s' comanda a e #: tests/genfile.c:706 #, fuzzy, c-format msgid "cannot unlink `%s'" -msgstr "%s: Nu pot cãuta (seek) cãtre %s" +msgstr "%s: Nu pot crea symlink cãtre %s" #: tests/genfile.c:833 #, c-format @@ -2873,58 +2905,21 @@ msgstr "" msgid "--stat requires file names" msgstr "--Amestecat numele fiºierelor--\n" -#, fuzzy -#~ msgid "Cannot get working directory" -#~ msgstr "Nu pot schimba directorul în care lucrez" - #~ msgid "sort names to extract to match archive" #~ msgstr "sorteazã numele de extras sã se potriveascã cu arhiva" #, fuzzy -#~ msgid "Invalid group" -#~ msgstr "%s: Grup invalid" - -#, fuzzy -#~ msgid "%s: Directory removed before we read it" -#~ msgstr "%s: Fiºier ºters înainte de a-l putea citi" - -#, fuzzy -#~ msgid "Cannot restore working directory" -#~ msgstr "Nu pot salva directorul în care lucrez" +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "--occurrence nu poate fi folosit în modul de operare cerut" -#, fuzzy -#~ msgid "Cannot resolve hostname %s" -#~ msgstr "%s: Nu pot redenumi ca %s" +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "Nu puteþi combina --listed-incremental cu --newer" #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: opþiune ilegalã -- %c\n" -#~ msgid "Reading %s\n" -#~ msgstr "Citesc %s\n" - -#~ msgid "" -#~ "\n" -#~ "Report bugs to <%s>.\n" -#~ msgstr "" -#~ "\n" -#~ "Raportaþi bug-uri la <%s>.\n" - -#~ msgid "filter the archive through bzip2" -#~ msgstr "filtrazã arhiva prin bzip2" - -#~ msgid "filter the archive through gzip" -#~ msgstr "filtreazã arhiva prin gzip" - -#~ msgid "filter the archive through compress" -#~ msgstr "filtreazã arhiva prin compress" - -#, fuzzy -#~ msgid "filter the archive through lzma" -#~ msgstr "filtreazã arhiva prin gzip" - -#, fuzzy -#~ msgid "filter the archive through lzop" -#~ msgstr "filtreazã arhiva prin gzip" +#~ msgid "block size" +#~ msgstr "dimensiune bloc" #~ msgid "rmtd: Cannot allocate buffer space\n" #~ msgstr "rmtd: Nu pot aloca spaþiu memorie intermediarã\n" @@ -2935,33 +2930,12 @@ msgstr "--Amestecat numele fi #~ msgid "Try `%s --help' for more information.\n" #~ msgstr "Încercaþi `%s --help' pentru informaþii suplimentare.\n" -#, fuzzy #~ msgid "" -#~ "Usage: %s [OPTION]\n" -#~ "Manipulate a tape drive, accepting commands from a remote process.\n" #~ "\n" -#~ " --version Output version info.\n" -#~ " --help Output this help.\n" +#~ "Report bugs to <%s>.\n" #~ msgstr "" -#~ "Folosire: %s [OPÞIUNE]\n" -#~ "Manipuleazã o unitate de bandã, acceptând comenzi de la un proces " -#~ "remote.\n" #~ "\n" -#~ " --version Afiºeazã informaþii versiune.\n" -#~ " --help Afiºeazã acest mesaj.\n" - -#, fuzzy -#~ msgid "Seek offset error" -#~ msgstr "Decalaj cãutare (seek offset) în afara domeniului" - -#~ msgid "Premature end of file" -#~ msgstr "Sfârºit de fiºier prematur" - -#~ msgid "Error is not recoverable: exiting now" -#~ msgstr "Nu-mi pot reveni din eroare: termin acum" - -#~ msgid "block size" -#~ msgstr "dimensiune bloc" +#~ "Raportaþi bug-uri la <%s>.\n" #~ msgid "" #~ "This program comes with NO WARRANTY, to the extent permitted by law.\n" @@ -2974,15 +2948,24 @@ msgstr "--Amestecat numele fi #~ "Îl puteþi redistribui conform termenilor din GNU General Public License;\n" #~ "vedeþi fiºierul numit COPYING pentru detalii." +#~ msgid "Premature end of file" +#~ msgstr "Sfârºit de fiºier prematur" + #~ msgid "rmtd: Garbage command %c\n" #~ msgstr "rmtd: Comandã gunoi %c\n" +#~ msgid "Reading %s\n" +#~ msgstr "Citesc %s\n" + #~ msgid "WARNING: No volume header" #~ msgstr "AVERTISMENT: Nici un antet de volum" #~ msgid "Visible long name error" #~ msgstr "Eroare nume lung evidentã" +#~ msgid "Error is not recoverable: exiting now" +#~ msgstr "Nu-mi pot reveni din eroare: termin acum" + #~ msgid "Device number out of range" #~ msgstr "Numãr dispozitiv în afara intervalului" @@ -2992,9 +2975,6 @@ msgstr "--Amestecat numele fi #~ msgid "Renamed %s to %s" #~ msgstr "Redenumit %s ca %s" -#~ msgid "%s: Cannot symlink to %s" -#~ msgstr "%s: Nu pot crea symlink cãtre %s" - #~ msgid "Symlinked %s to %s" #~ msgstr "Creat symlink %s cãtre %s" @@ -3013,12 +2993,15 @@ msgstr "--Amestecat numele fi #~ msgid "do not extract permissions information" #~ msgstr "nu extrage informaþii permisiuni" +#~ msgid "filter the archive through bzip2" +#~ msgstr "filtrazã arhiva prin bzip2" + +#~ msgid "filter the archive through compress" +#~ msgstr "filtreazã arhiva prin compress" + #~ msgid "FILE-OF-NAMES" #~ msgstr "FIªIER-DE-NUME" -#~ msgid "exclude patterns are plain strings" -#~ msgstr "pattern-urile de excludere sunt ºiruri simple" - #~ msgid "dump instead the files symlinks point to" #~ msgstr "foloseºte în schimb fiºierele cãtre care point-eazã symlink-urile" diff --git a/po/ru.gmo b/po/ru.gmo index ea045fc..dce82dd 100644 Binary files a/po/ru.gmo and b/po/ru.gmo differ diff --git a/po/ru.po b/po/ru.po index 1210dfb..1d3e1df 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1,18 +1,18 @@ # Translation of tar messages to Russian # Copyright (C) 1998, 1999, 2004, 2006, 2009 Free Software Foundation, Inc. # This file is distributed under the same license as the tar package. +# # Const Kaplinsky , 1998, 1999. # Pavel Maryanov , 2004, 2006, 2008. -# Yuri Kozlov , 2009. -# Pavel Maryanov , 2010. -# -#: src/create.c:1572 +# Yuri Kozlov , 2009, 2013. +# Pavel Maryanov , 2010, 2014. +#: src/create.c:1574 msgid "" msgstr "" -"Project-Id-Version: tar 1.24\n" +"Project-Id-Version: tar 1.27\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" -"PO-Revision-Date: 2010-10-25 12:19+0200\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" +"PO-Revision-Date: 2014-07-10 15:24+0200\n" "Last-Translator: Pavel Maryanov \n" "Language-Team: Russian \n" "Language: ru\n" @@ -21,6 +21,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Poedit 1.6.6\n" #: gnu/argmatch.c:135 #, c-format @@ -83,16 +84,16 @@ msgid " [OPTION...]" msgstr " [ПÐРÐМЕТР...]" #: gnu/argp-help.c:1686 -#, fuzzy, c-format +#, c-format msgid "Try '%s --help' or '%s --usage' for more information.\n" msgstr "" -"Попробуйте `%s --help' или `%s --usage' Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ñ… " -"Ñведений.\n" +"Попробуйте «%s --help» или «%s --usage» Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð±Ð¾Ð»ÐµÐµ подробного " +"опиÑаниÑ.\n" #: gnu/argp-help.c:1714 #, c-format msgid "Report bugs to %s.\n" -msgstr "Отчёты об ошибках отправлÑйте по адреÑу: %s.\n" +msgstr "Ð¡Ð¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾Ð± ошибках отправлÑйте по адреÑу: %s.\n" #: gnu/argp-help.c:1933 gnu/error.c:190 msgid "Unknown system error" @@ -106,7 +107,7 @@ msgstr "вывод Ñтой Ñправки" msgid "give a short usage message" msgstr "вывод короткого ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾Ð± иÑпользовании" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "ИМЯ" @@ -145,9 +146,9 @@ msgid "write error" msgstr "ошибка запиÑи" #: gnu/getopt.c:549 gnu/getopt.c:578 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: параметр «%s» не однозначен\n" +msgstr "%s: двуÑмыÑленный параметр «%s»; возможные варианты:" #: gnu/getopt.c:626 gnu/getopt.c:630 #, c-format @@ -439,7 +440,7 @@ msgstr "Справка по работе Ñ ÐŸÐž GNU: " msgstr "ÐÐµÐ¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸Ð²Ð°ÐµÐ¼Ð°Ñ Ð²ÐµÑ€ÑÐ¸Ñ Ð¸Ð½ÐºÑ€ÐµÐ¼ÐµÐ½Ñ‚Ð½Ð¾Ð³Ð¾ формата: %" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Ðеверно Ñформирован dump-каталог: ожидалÑÑ '%c', а найден %#3o" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Ðеверно Ñформирован dump-каталог: 'X' повторÑетÑÑ" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Ðеверно Ñформирован dump-каталог: пуÑтое Ð¸Ð¼Ñ Ð² 'R'" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Ðеверно Ñформирован dump-каталог: перед 'T' не Ñтоит 'R'" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Ðеверно Ñформирован dump-каталог: пуÑтое Ð¸Ð¼Ñ Ð² 'T'" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "Ðеверно Ñформирован dump-каталог: ожидалÑÑ '%c', а найден конец данных" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "Ðеверно Ñформирован dump-каталог: 'X' ни разу не иÑпользован" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Ðевозможно Ñоздать временный каталог Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ шаблона %s" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Каталог не удалён: невозможно выполнить stat" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: Каталог находитÑÑ Ð½Ð° другом уÑтройÑтве: не удален" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: УдалÑетÑÑ %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: Ðевозможно удалить" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: ПропуÑкаетÑÑ" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "блок %s: ** Блок нулей **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "блок %s: ** Конец файла **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "блок %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Ð’ заголовке пуÑтое поле вмеÑто ожидаемого чиÑлового Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1244,182 +1253,180 @@ msgstr "" "дополнение до двух" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "ВоÑьмеричное значение архива %.*s за пределами диапазона %s" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "Ðрхив Ñодержит уÑтаревающие заголовки base-64" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Ðрхив подпиÑан Ñтрокой base-64 %s за пределами диапазона %s" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Значение base-256 архива за пределами диапазона %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Заголовок Ñодержит %.*s вмеÑто ожидаемого чиÑлового Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Значение архива %s за пределами %s диапазона %s..%s" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " ÑÑылка на %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " неизвеÑтный тип файла %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--Ð”Ð»Ð¸Ð½Ð½Ð°Ñ ÑÑылка--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--Длинное имÑ--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Заголовок тома--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Продолжение Ñ Ð¿Ð¾Ð·Ð¸Ñ†Ð¸Ð¸ %s--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Создание каталога:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "%s переименован в %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Ðевозможно переименовать в %s" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "%s переименовываетÑÑ Ð½Ð°Ð·Ð°Ð´ в %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Файла удален до его ÑчитываниÑ" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "дочерний процеÑÑ" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "межпроцеÑÑорный канал" #: src/names.c:360 -#, fuzzy msgid "command line" -msgstr "Сбой команды %s" +msgstr "ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð°Ñ Ñтрока" #: src/names.c:378 -#, fuzzy, c-format +#, c-format msgid "%s: file list requested from %s already read from %s" -msgstr "%s: ÑпиÑок файлов уже прочитан" +msgstr "%s: ÑпиÑок файлов, запрошенный из %s, уже прочитан из %s" -#: src/names.c:448 -#, fuzzy, c-format +#: src/names.c:448 src/checkpoint.c:274 +#, c-format msgid "cannot split string '%s': %s" -msgstr "невозможно уÑтановить Ð²Ñ€ÐµÐ¼Ñ Ð² `%s'" +msgstr "невозможно разделить Ñтроку «%s»: %s" #: src/names.c:490 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: в прочитанном имени файла приÑутÑтвует пуÑтой Ñимвол" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "Ð’ именах файлов иÑпользуютÑÑ Ñимволы подÑтановки" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" "ИÑпользуйте --wildcards, чтобы задейÑтвовать Ñти Ñимволы, или --no-" -"wildcards, чтобы убрать Ñто предепреждение." +"wildcards, чтобы убрать Ñто предупреждение" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: Ðе найден в архиве" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Требуемое вхождение не найдено в архиве" -#: src/names.c:876 +#: src/names.c:879 #, c-format msgid "Archive label mismatch" -msgstr "ÐеÑоответÑтвиве метки архива" +msgstr "ÐеÑоответÑтвие метки архива" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "Параметра -C в ÑпиÑке файлов Ð½ÐµÐ»ÑŒÐ·Ñ Ð˜Ñпользовать Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ --listed-" "incremental" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" "С параметром --listed-incremental можно иÑпользовать только параметр -C" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" -msgstr "Ð”Ð»Ñ Ð¾Ð±Ð¾Ð¸Ñ… параметров «-%s» и «-%s» иÑпользуетÑÑ Ñтандартный ввод" +msgid "Options '%s' and '%s' both want standard input" +msgstr "Ð”Ð»Ñ Ð¾Ð±Ð¾Ð¸Ñ… параметров «-%s» и «-%s» требуетÑÑ Ñтандартный ввод" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s: Ðеверный формат архива" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "Запрошены раÑÑˆÐ¸Ñ€ÐµÐ½Ð¸Ñ GNU Ð´Ð»Ñ Ð½ÐµÑовмеÑтимого формата архива" -#: src/tar.c:255 -#, fuzzy, c-format +#: src/tar.c:264 +#, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." msgstr "" -"ÐеизвеÑтный Ñтиль Ñ†Ð¸Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Â«%s». ВоÑпользуйтеÑÑŒ параметром «%s --quoting-" -"style=help» Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»Ð½Ð¾Ð³Ð¾ ÑпиÑка. " +"ÐеизвеÑтный Ñтиль Ñ†Ð¸Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Â«%s». ВоÑпользуйтеÑÑŒ «%s --quoting-style=help» " +"Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»Ð½Ð¾Ð³Ð¾ ÑпиÑка." -#: src/tar.c:364 -#, fuzzy +#: src/tar.c:378 msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1429,17 +1436,16 @@ msgid "" " tar -tvf archive.tar # List all files in archive.tar verbosely.\n" " tar -xf archive.tar # Extract all files from archive.tar.\n" msgstr "" -"GNU tar предназначен Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² на магнитную ленту или в архив на " -"диÑке и Ð´Ð»Ñ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ð´ÐµÐ»ÑŒÐ½Ñ‹Ñ… файлов из архива.\n" +"GNU «tar» предназначен Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð² в единый архив на магнитную " +"ленту или на диÑк и Ð´Ð»Ñ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ð´ÐµÐ»ÑŒÐ½Ñ‹Ñ… файлов из архива.\n" "\n" "Примеры:\n" -" tar -cf archive.tar foo bar # Создание archive.tar из файлов foo и bar.\n" -" tar -tvf archive.tar # Вывод подробного ÑпиÑка вÑех файлов в " -"архиве archive.tar.\n" -" tar -xf archive.tar # Извлечение вÑех файлов из archive.tar.\n" +" tar -cf archive.tar foo bar # Создаёт archive.tar из файлов foo и bar.\n" +" tar -tvf archive.tar # Выводит подробный ÑпиÑок вÑех файлов\n" +" в архиве archive.tar.\n" +" tar -xf archive.tar # Извлекает вÑе файлы из archive.tar.\n" -#: src/tar.c:373 -#, fuzzy +#: src/tar.c:387 msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" "The version control may be set with --backup or VERSION_CONTROL, values " @@ -1450,90 +1456,90 @@ msgid "" " nil, existing numbered if numbered backups exist, simple otherwise\n" " never, simple always make simple backups\n" msgstr "" -"Ð¡ÑƒÑ„Ñ„Ð¸ÐºÑ Ð´Ð»Ñ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ñ‹Ñ… копий - '~', еÑли он не уÑтановлен через --suffix\n" +"Ð¡ÑƒÑ„Ñ„Ð¸ÐºÑ Ð´Ð»Ñ Ñ€ÐµÐ·ÐµÑ€Ð²Ð½Ñ‹Ñ… копий — «~», еÑли он не уÑтановлен через --suffix\n" "или SIMPLE_BACKUP_SUFFIX. Управление верÑиÑми может быть уÑтановлено\n" "через --backup или VERSION_CONTROL. ЗначениÑми могут быть:\n" "\n" " none, off не Ñоздавать резервные копии\n" " t, numbered Ñоздавать нумерованные резервные копии\n" -" nil, existing нумерованные, еÑли ÑущеÑтвуют нумерованные копии, иначе " -"проÑтые\n" +" nil, existing нумерованные, еÑли ÑущеÑтвуют нумерованные копии,\n" +" иначе проÑтые\n" " never, simple вÑегда Ñоздавать проÑтые резервные копии\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "ОÑновной режим работы:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "вывод ÑпиÑка Ñодержимого архива" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "извлечение файлов из архива" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "Ñоздание нового архива" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "поиÑк различий между архивом и файловой ÑиÑтемой" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "добавление файлов в конец архива" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "добавление в архив только более новых файлов" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "приÑоединение tar-файлов к архиву" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "удаление из архива (не на магнитных лентах!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "проверка метки тома архива и выход" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "Модификаторы:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "ÑÑ„Ñ„ÐµÐºÑ‚Ð¸Ð²Ð½Ð°Ñ Ð¾Ð±Ñ€Ð°Ð±Ð¾Ñ‚ÐºÐ° разрежённых файлов" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "MAJOR[.MINOR]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" "уÑтановить верÑию иÑпользуемого формата Ñ€Ð°Ð·Ñ€ÐµÐ¶ÐµÐ½Ð¸Ñ (подразумевает --sparse)" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "обработка добавочного Ñ€ÐµÐ·ÐµÑ€Ð²Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñтарого формата GNU" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "обработка добавочного Ñ€ÐµÐ·ÐµÑ€Ð²Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ формата GNU" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "уровень ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð»Ñ Ñозданного разноÑтного архива Ñо ÑпиÑком" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "не завершать работу при ненулевом ÑтатуÑе Ð´Ð»Ñ Ð½ÐµÑ‡Ð¸Ñ‚Ð°ÐµÐ¼Ñ‹Ñ… файлов" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1545,136 +1551,143 @@ msgstr "" "list, и когда ÑпиÑок файлов задан либо в командной Ñтроке, либо через опцию -" "T. По умолчанию N равен 1." -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "доÑтупен поиÑк по архиву" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "поиÑк по архиву недоÑтупен" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "не проверÑÑ‚ÑŒ номера уÑтройÑтв при Ñоздании инкрементных архивов" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" "проверÑÑ‚ÑŒ номера уÑтройÑтв при Ñоздании инкрементных архивов (по умолчанию)" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "Управление перезапиÑью:" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "попытка проверить архив поÑле его запиÑи" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "удаление файлов поÑле их Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð² архив" -#: src/tar.c:471 -#, fuzzy +#: src/tar.c:485 msgid "don't replace existing files when extracting, treat them as errors" -msgstr "не перезапиÑывать ÑущеÑтвующие файлы при извлечении" +msgstr "" +"не перезапиÑывать ÑущеÑтвующие файлы при извлечении, Ñчитать Ñто ошибкой" -#: src/tar.c:474 -#, fuzzy +#: src/tar.c:488 msgid "don't replace existing files when extracting, silently skip over them" -msgstr "не перезапиÑывать ÑущеÑтвующие файлы при извлечении" +msgstr "" +"не перезапиÑывать ÑущеÑтвующие файлы при извлечении, проÑто пропуÑкать их" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "" "не перезапиÑывать ÑущеÑтвующие файлы, которые более новые, чем их копии в " "архиве" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "перезапиÑÑŒ ÑущеÑтвующих файлов при извлечении" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "удаление каждого файла до Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð²ÐµÑ€Ñ… него" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "очиÑтка вÑей иерархии до Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð°" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "Ñохранение метаданных ÑущеÑтвующих каталогов" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "перезапиÑÑŒ ÑущеÑтвующих файлов при извлечении (по умолчанию)" -#: src/tar.c:490 -#, fuzzy +#: src/tar.c:504 msgid "preserve existing symlinks to directories when extracting" -msgstr "перезапиÑÑŒ ÑущеÑтвующих файлов при извлечении" +msgstr "Ñохранить ÑущеÑтвующие Ñимвольные файлы на каталоги при извлечении" + +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "КÐТÐЛОГ" -#: src/tar.c:496 +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "Выбор выходного потока:" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "извлекать файлы на Ñтандартный вывод" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "КОМÐÐДÐ" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "перенаправлÑÑ‚ÑŒ извлечённые файлы в другую программу" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "игнорировать коды Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ð´Ð¾Ñ‡ÐµÑ€Ð½Ð¸Ñ… процеÑÑов" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "Ñчитать ненулевые коды Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ð´Ð¾Ñ‡ÐµÑ€Ð½Ð¸Ñ… процеÑÑов как ошибку" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Обработка атрибутов файлов:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "" "принудительно уÑтанавливать ИМЯ в качеÑтве владельца Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð½Ñ‹Ñ… файлов" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "" "принудительно уÑтанавливать ИМЯ в качеÑтве группы Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð½Ñ‹Ñ… файлов" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "ДÐТÐ-ИЛИ-ФÐЙЛ" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "уÑтанавливать Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð½Ñ‹Ñ… файлов mtime из ДÐТЫ-ИЛИ-ФÐЙЛÐ" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "РЕЖИМ" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "" "принудительно уÑтанавливать (Ñимвольный) РЕЖИМ доÑтупа Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»Ñемых файлов" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "СПОСОБ" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " @@ -1684,11 +1697,11 @@ msgstr "" "поÑле Ñ‡Ñ‚ÐµÐ½Ð¸Ñ (СПОСОБ='replace'; иÑпользуетÑÑ Ð¿Ð¾ умолчанию) или не уÑтановки " "времени в первую очередь (СПОСОБ='system')" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "не извлекать Ð²Ñ€ÐµÐ¼Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð°" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" @@ -1696,22 +1709,22 @@ msgstr "" "попытатьÑÑ Ð¸Ð·Ð²Ð»ÐµÑ‡ÑŒ файлы Ñ Ñ‚ÐµÐ¼ же владельцем, что и в архиве (по умолчанию " "Ð´Ð»Ñ ÑупепользователÑ)" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "" "извлекать файлы как Ñвои ÑобÑтвенные (по умолчанию Ð´Ð»Ñ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ñ… пользователей)" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "иÑпользовать чиÑла вмеÑто имён владельца/группы" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" "извлекать информацию о правах доÑтупа к файлу (по умолчанию Ð´Ð»Ñ " "ÑуперпользователÑ)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1719,16 +1732,16 @@ msgstr "" "применÑÑ‚ÑŒ umask Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¿Ñ€Ð¸ извлечении прав доÑтупа из архива (по " "умолчанию Ð´Ð»Ñ Ð¾Ð±Ñ‹Ñ‡Ð½Ñ‹Ñ… пользователей)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" -msgstr "" +msgstr "члены-аргументы перечиÑлены в том же порÑдке как файлы в архиве" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "Ñквивалент -p и -s" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1736,181 +1749,188 @@ msgstr "" "не уÑтанавливать Ð²Ñ€ÐµÐ¼Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¸ права доÑтупа извлечённых каталогов до " "Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ñ†ÐµÑÑа извлечениÑ" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "отменить дейÑтвие параметра --delay-directory-restore" -#: src/tar.c:554 -#, fuzzy +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 msgid "Handling of extended file attributes:" -msgstr "Обработка атрибутов файлов:" +msgstr "Обработка раÑширенных атрибутов файлов:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" -msgstr "" +msgstr "Включить поддержку раÑширенных атрибутов" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" -msgstr "" +msgstr "Отключить поддержку раÑширенных атрибутов" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" -msgstr "" +msgstr "ÐœÐСКÐ" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" -msgstr "" +msgstr "задаёт шаблон включаемых ключей xattr" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" -msgstr "" +msgstr "задаёт шаблон иÑключаемых ключей xattr" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" -msgstr "" +msgstr "Включить поддержку контекÑта SELinux" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" -msgstr "" +msgstr "Отключить поддержку контекÑта SELinux" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" -msgstr "" +msgstr "Включить поддержку POSIX ACL" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" -msgstr "" +msgstr "Отключить поддержку POSIX ACL" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "Выбор и переключение уÑтройÑтв:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ÐРХИВ" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "иÑпользовать файл или уÑтройÑтво ÐРХИВ" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "файл архива ÑвлÑетÑÑ Ð»Ð¾ÐºÐ°Ð»ÑŒÐ½Ñ‹Ð¼, даже еÑли Ñодержит двоеточие" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "иÑпользовать указанную КОМÐÐДУ rmt вмеÑто rmt" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "иÑпользовать удалённую КОМÐÐДУ вмеÑто rsh" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "указать уÑтройÑтво и плотноÑÑ‚ÑŒ" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "Ñоздание/лиÑтинг/извлечение многотомных архивов" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "Ñменить ленту поÑле запиÑи ЧИСЛО x 1024 байт" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "" "запуÑтить Ñкрипт по окончании каждой ленты (подразумеваетÑÑ Ð¸Ñпользование -Ðœ)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "иÑпользовать/обновлÑÑ‚ÑŒ номера тома в ФÐЙЛЕ" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "Разбиение на блоки:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "БЛОКИ" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "чиÑло БЛОКОВ x 512 байт на запиÑÑŒ" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "ЧИСЛО байт на запиÑÑŒ, кратное 512" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "игнорировать нулевые блоки в архиве (Ñ‚.е. EOF)" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "заново разбивать на блоки при чтении (Ð´Ð»Ñ ÐºÐ°Ð½Ð°Ð»Ð¾Ð² 4.2BSD)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "Формата архива:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "ФОРМÐТ" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "Ñоздать архив в указанном формате" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "ФОРМÐТОМ может быть:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "Ñтарый формат tar V7" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "формат GNU как в tar <= 1.12" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "формат GNU tar 1.13.Ñ…" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "формат POSIX 1003.1-1988 (ustar)" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "формат POSIX 1003.1-2001 (pax)" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "Ñквивалент pax" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "Ñквивалент --format=v7" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "Ñквивалент --format=posix" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "keyword[[:]=значение][,keyword[[:]=значение]]..." -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "управлÑющие ключевые Ñлова pax" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "ТЕКСТ" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1918,76 +1938,74 @@ msgstr "" "Ñоздать архив Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ тома ТЕКСТ; при лиÑтинге/извлечении иÑпользовать " "ТЕКСТ в качеÑтве шаблона подÑтановки" -#: src/tar.c:660 +#: src/tar.c:684 msgid "Compression options:" msgstr "Опции ÑжатиÑ:" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "иÑпользовать ÑÑƒÑ„Ñ„Ð¸ÐºÑ Ð°Ñ€Ñ…Ð¸Ð²Ð° Ð´Ð»Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ ÑжатиÑ" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "не иÑпользовать ÑÑƒÑ„Ñ„Ð¸ÐºÑ Ð°Ñ€Ñ…Ð¸Ð²Ð° Ð´Ð»Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ ÑжатиÑ" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "ПРОГ" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "пропуÑтить архив через ПРОГ (должна поддерживать -d)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "Выбор локальных файлов:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" "добавить указанный ФÐЙЛ в архив (полезно, еÑли Ð¸Ð¼Ñ Ð½Ð°Ñ‡Ð¸Ð½Ð°ÐµÑ‚ÑÑ Ñ Ð´ÐµÑ„Ð¸Ñа)" -#: src/tar.c:687 -msgid "DIR" -msgstr "КÐТÐЛОГ" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "перейти в КÐТÐЛОГ" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "загрузить из ФÐЙЛРимена Ð´Ð»Ñ Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð»Ð¸ ÑозданиÑ" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "-T читает Ñтроки, оканчивающиеÑÑ Ð½ÑƒÐ»Ñ‘Ð¼, отключает опцию -C" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "выключить воздейÑтвие предыдущей опции --null" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" msgstr "убрать кавычки Ñ Ð¸Ð¼Ñ‘Ð½ файлов, прочитанных Ñ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹ -T (по умолчанию)" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" msgstr "не убирать кавычки Ñ Ð¸Ð¼Ñ‘Ð½ файлов, прочитанных Ñ Ð¾Ð¿Ñ†Ð¸ÐµÐ¹ -T" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "ШÐБЛОÐ" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "иÑключать файлы, определённые ШÐБЛОÐОМ" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "иÑключать шаблоны, перечиÑленных в ФÐЙЛЕ" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1995,95 +2013,107 @@ msgstr "" "иÑключать Ñодержимое каталогов Ñ Ñ„Ð°Ð¹Ð»Ð¾Ð¼ CACHEDIR.TAG за иÑключением Ñамого " "файла Ñ Ñ‚ÐµÐ³Ð°Ð¼Ð¸" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "иÑключать вÑÑ‘ Ñодержимое каталогов, Ñодержащих файл CACHEDIR.TAG" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "иÑключать каталоги, Ñодержащие файл CACHEDIR.TAG" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "иÑключать каталоги, Ñодержащие ФÐЙЛ, за иÑключением Ñамого ФÐЙЛÐ" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "иÑключать вÑÑ‘ Ñодержимое каталогов, Ñодержащих ФÐЙЛ" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "иÑключать каталоги Ñ Ð¤ÐЙЛОМ" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "иÑключать каталоги CVS" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "иÑключать резервные файлы и файлы блокировки" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "отключить автоматичеÑкий ÑпуÑк в каталоги" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "оÑтаватьÑÑ Ð² локальной файловой ÑиÑтеме при Ñоздании архива" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "рекурÑивный ÑпуÑк по каталогам (по умолчанию)" -#: src/tar.c:729 -#, fuzzy +#: src/tar.c:761 msgid "don't strip leading '/'s from file names" -msgstr "не удалÑÑ‚ÑŒ начальные `/' из имен файлов" +msgstr "не удалÑÑ‚ÑŒ начальные «/» из имён файлов" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "" "Ñледовать по Ñимвольным ÑÑылкам и ÑохранÑÑ‚ÑŒ файлы, на которые они указывают" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "" "Ñледовать по жёÑтким ÑÑылкам и ÑохранÑÑ‚ÑŒ файлы, на которые они указывают" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "ИМЯ-ЧЛЕÐÐ" -#: src/tar.c:735 -#, fuzzy +#: src/tar.c:767 msgid "begin at member MEMBER-NAME when reading the archive" -msgstr "начинать Ñ Ñ‡Ð»ÐµÐ½Ð° ИМЯ-ЧЛЕÐРв архиве" +msgstr "начинать Ñ Ñ‡Ð»ÐµÐ½Ð° ИМЯ-ЧЛЕÐРпри чтении архива" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "ÑохранÑÑ‚ÑŒ только те файлы, которые новее ДÐТЫ-ИЛИ-ФÐЙЛÐ" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "ДÐТÐ" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "Ñравнивать дату и времÑ, только еÑли изменены данные" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "УПРÐВЛЕÐИЕ" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "делать копию перед удалением, УПРÐВЛЕÐИЕ выбора верÑий" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "СТРОКÐ" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -2091,104 +2121,101 @@ msgstr "" "делать копию перед удалением, переопределÑет обычный ÑÑƒÑ„Ñ„Ð¸ÐºÑ ('~', еÑли " "только он не переопределён переменной Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "Преобразование имён файлов:" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "" "удалÑÑ‚ÑŒ указанное ЧИСЛО начальных компонентов из имён файлов перед " "извлечением" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "РÐСШИРЕÐИЕ" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "иÑпользовать замену РÐСШИРЕÐИЯ sed'ом Ð´Ð»Ñ Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð¼Ñ‘Ð½ файлов" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "Опции шаблонов подÑтановки Ð´Ð»Ñ Ð¸Ð¼Ñ‘Ð½ файлов (влиÑÑŽÑ‚ на шаблоны Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¸ " "иÑключениÑ):" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "игнорировать региÑÑ‚Ñ€" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "шаблоны начала имени файла" -#: src/tar.c:767 -#, fuzzy +#: src/tar.c:799 msgid "patterns match after any '/' (default for exclusion)" -msgstr "шаблоны поÑле любого '/' (по умолчанию Ð´Ð»Ñ Ð¸Ñключаемых)" +msgstr "шаблоны Ñовпадают поÑле любого «/» (по умолчанию Ð´Ð»Ñ Ð¸Ñключаемых)" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "Ñ ÑƒÑ‡Ñ‘Ñ‚Ð¾Ð¼ региÑтра (по умолчанию)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "иÑпользовать маÑки (по умолчанию Ð´Ð»Ñ Ð¸Ñключаемых)" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "точное ÑоответÑтвие Ñтроке" -#: src/tar.c:775 -#, fuzzy +#: src/tar.c:807 msgid "wildcards do not match '/'" -msgstr "маÑки не ÑоответÑтвуют '/'" +msgstr "маÑки не ÑоответÑтвуют «/»" -#: src/tar.c:777 -#, fuzzy +#: src/tar.c:809 msgid "wildcards match '/' (default for exclusion)" -msgstr "маÑки ÑоответÑтвуют '/' (по умолчанию Ð´Ð»Ñ Ð¸Ñключаемых)" +msgstr "маÑки ÑоответÑтвуют «/» (по умолчанию Ð´Ð»Ñ Ð¸Ñключаемых)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Вывод информации:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "подробный лиÑтинг обрабатываемых файлов" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "КЛЮЧЕВОЕ СЛОВО" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "управление предупреждением" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" "вывод Ñообщений о ходе Ð²Ñ‹Ð¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ñ‡ÐµÑ€ÐµÐ· каждые ЧИСЛО запиÑей (по умолчанию " "10)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "ДЕЙСТВИЕ" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "выполнÑÑ‚ÑŒ ДЕЙСТВИЕ на каждой контрольной точке" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "вывод Ñообщений, еÑли Ñохранены не вÑе ÑÑылки" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "СИГÐÐЛ" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2200,35 +2227,35 @@ msgstr "" "SIGQUIT, SIGINT, SIGUSR1 и SIGUSR2. Также разрешаетÑÑ Ð¸Ñпользовать имена без " "префикÑа SIG" -#: src/tar.c:802 +#: src/tar.c:834 msgid "print file modification times in UTC" msgstr "вывод времени Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° в формате UTC" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "вывод имени файла и его полного разрешениÑ" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "отправить подробный вывод данных в FILE" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "выводить номера блоков архива в каждом Ñообщении" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "запрашивать подтверждение Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ дейÑтвиÑ" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "показать Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ tar по умолчанию" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" -msgstr "" +msgstr "показать допуÑтимые диапазоны Ð´Ð»Ñ Ð¿Ð¾Ð»ÐµÐ¹ snapshot-файла" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2236,31 +2263,31 @@ msgstr "" "при выводе лиÑтинга или извлечении показывать вÑе каталоги, не " "ÑоответÑтвующем уÑловию поиÑка" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "показывать имена файлов или архивов поÑле преобразованиÑ" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "СТИЛЬ" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "уÑтановить Ñтиль Ñ†Ð¸Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸Ð¼Ñ‘Ð½. Ð—Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¡Ð¢Ð˜Ð›Ð¯ Ñм. ниже" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "дополнительно цитировать Ñимволы из СТРОКИ" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "отключить цитирование Ñимволов из СТРОКИ" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "Опции ÑовмеÑтимоÑти:" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2268,55 +2295,56 @@ msgstr "" "при Ñоздании, Ñквивалент --old-archive; при извлечении, Ñквивалент --no-same-" "owner" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "Другие опции:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "отключить иÑпользование некоторых потенциально опаÑных опций" -#: src/tar.c:978 -#, fuzzy +#: src/tar.c:1010 msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" -msgstr "Указать можно только один из параметров «-Acdtrux» или «--test-label»" +msgstr "" +"Указать можно только один из параметров «-Acdtrux», «--delete» или «--test-" +"label»" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Конфликт опций ÑжатиÑ" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "ÐеизвеÑтное название Ñигнала: %s" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "Файл Ñ Ð¾Ð±Ñ€Ð°Ð·Ñ†Ð¾Ð¼ даты не найден" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "%s заменÑетÑÑ Ð½Ð° неизвеÑтный формат даты %s" -#: src/tar.c:1108 -#, fuzzy, c-format +#: src/tar.c:1140 +#, c-format msgid "Option %s: Treating date '%s' as %s" -msgstr "ÐžÐ¿Ñ†Ð¸Ñ `%s': дата '%s' раÑÑматриваетÑÑ ÐºÐ°Ðº %s" +msgstr "ÐžÐ¿Ñ†Ð¸Ñ %s: дата «%s» раÑÑматриваетÑÑ ÐºÐ°Ðº %s" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "пропуÑтить архив через %s" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "ДопуÑтимые аргументы Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð° --quoting-style:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2324,48 +2352,47 @@ msgstr "" "\n" "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾ умолчанию *Ñтого* tar:\n" -#: src/tar.c:1295 -#, fuzzy +#: src/tar.c:1330 msgid "Invalid owner or group ID" -msgstr "Ðеверный владелец" +msgstr "Ðеверный владелец или группа" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Ðеверный размер ёмкоÑти блока" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "ÐÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð´Ð»Ð¸Ð½Ð° ленты" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "ÐедопуÑтимое значение добавочного уровнÑ" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "Больше одной пороговой даты" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "Ðеверное значение верÑии разрежениÑ" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' не поддерживаетÑÑ Ð½Ð° Ñтой платформе" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "значение --checkpoint не ÑвлÑетÑÑ Ñ†ÐµÐ»Ñ‹Ð¼ чиÑлом" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Ð’ опции указан неверный режим доÑтупа" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "Ðеверное чиÑло" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" @@ -2373,70 +2400,67 @@ msgstr "" "ÐžÐ¿Ñ†Ð¸Ñ --preserve уÑтарела, иÑпользуйте --preserve-permissions --preserve-" "order" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Ðеверный размер запиÑи" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "Размер запиÑи должен быть кратен %d." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "Ðеверное чиÑло Ñлементов" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "РазрешаетÑÑ Ð¸Ñпользовать только одну опцию --to-command" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "Ðеверно Ñформирован аргумент плотноÑти: %s" -#: src/tar.c:2133 -#, fuzzy, c-format +#: src/tar.c:2205 +#, c-format msgid "Unknown density: '%c'" -msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¿Ð»Ð¾Ñ‚Ð½Ð¾ÑÑ‚ÑŒ: '%c'" +msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¿Ð»Ð¾Ñ‚Ð½Ð¾ÑÑ‚ÑŒ: «%c»" -#: src/tar.c:2150 -#, fuzzy, c-format +#: src/tar.c:2222 +#, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" -msgstr "Опции `-[0-7][lmh]' не поддерживаютÑÑ *Ñтим* tar'ом" +msgstr "Опции «-[0-7][lmh]» не поддерживаютÑÑ *Ñтим* tar-ом" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." -msgstr "[ФÐЙЛ]..." +msgstr "[ФÐЙЛ]…" -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 #, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "--%s не может быть иÑпользована Ñ %s" + +#: src/tar.c:2389 +#, c-format msgid "Old option '%c' requires an argument." -msgstr "Ð”Ð»Ñ Ñтарой опции `%c' нужно указать аргумент." +msgstr "Ð”Ð»Ñ Ñтарой опции «%c» нужно указать аргумент." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence беÑполезна без ÑпиÑка файлов" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "--occurrence не может быть иÑпользована запрошенном режиме работы" - -#: src/tar.c:2408 -#, fuzzy +#: src/tar.c:2490 msgid "Multiple archive files require '-M' option" -msgstr "Ð”Ð»Ñ Ð½ÐµÑкольких файлов архивов требуетÑÑ Ð¾Ð¿Ñ†Ð¸Ñ `-M'" - -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "ÐÐµÐ»ÑŒÐ·Ñ ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ --listed-incremental Ñ --newer" +msgstr "Ð”Ð»Ñ Ð½ÐµÑкольких файлов архивов требуетÑÑ Ð¾Ð¿Ñ†Ð¸Ñ Â«-M»" -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "параметр --level не имеет Ñмыла без --listed-incremental" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" @@ -2444,78 +2468,71 @@ msgstr[0] "%s: Метка тома Ñлишком Ð´Ð»Ð¸Ð½Ð½Ð°Ñ (макÑиму msgstr[1] "%s: Метка тома Ñлишком Ð´Ð»Ð¸Ð½Ð½Ð°Ñ (макÑимум %lu байта)" msgstr[2] "%s: Метка тома Ñлишком Ð´Ð»Ð¸Ð½Ð½Ð°Ñ (макÑимум %lu байт)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Ðевозможно проверить многотомные архивы" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Ðевозможно проверить Ñжатые архивы" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "Шаблон %s не может быть иÑпользован" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Ðевозможно иÑпользовать многотомные Ñжатые архивы" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "Ðевозможно объединить Ñжатые архивы" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option может быть иÑпользована только Ñ Ð°Ñ€Ñ…Ð¸Ð²Ð°Ð¼Ð¸ POSIX" -#: src/tar.c:2478 -#, fuzzy +#: src/tar.c:2560 msgid "--acls can be used only on POSIX archives" -msgstr "--pax-option может быть иÑпользована только Ñ Ð°Ñ€Ñ…Ð¸Ð²Ð°Ð¼Ð¸ POSIX" +msgstr "--acls может быть иÑпользована только Ñ Ð°Ñ€Ñ…Ð¸Ð²Ð°Ð¼Ð¸ POSIX" -#: src/tar.c:2483 -#, fuzzy +#: src/tar.c:2565 msgid "--selinux can be used only on POSIX archives" -msgstr "--pax-option может быть иÑпользована только Ñ Ð°Ñ€Ñ…Ð¸Ð²Ð°Ð¼Ð¸ POSIX" +msgstr "--selinux может быть иÑпользована только Ñ Ð°Ñ€Ñ…Ð¸Ð²Ð°Ð¼Ð¸ POSIX" -#: src/tar.c:2488 -#, fuzzy +#: src/tar.c:2570 msgid "--xattrs can be used only on POSIX archives" -msgstr "--pax-option может быть иÑпользована только Ñ Ð°Ñ€Ñ…Ð¸Ð²Ð°Ð¼Ð¸ POSIX" +msgstr "--xattrs может быть иÑпользована только Ñ Ð°Ñ€Ñ…Ð¸Ð²Ð°Ð¼Ð¸ POSIX" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "Шаблон %s не может быть иÑпользован" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" +msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "Размер тома не может быть меньше размера запиÑи" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "--preserve-order неÑовмеÑтим Ñ --listed-incremental" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "Робкий отказ от ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿ÑƒÑтого архива" -#: src/tar.c:2565 -#, fuzzy +#: src/tar.c:2669 msgid "Options '-Aru' are incompatible with '-f -'" msgstr "Параметры «-Aru» не ÑовмеÑтимы Ñ Â«-f -»" -#: src/tar.c:2660 -#, fuzzy +#: src/tar.c:2766 msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" -msgstr "Ðеобходимо указать один из параметров -Acdtrux или --test-label" +msgstr "" +"Ðеобходимо указать один из параметров «-Acdtrux», «--delete» или «--test-" +"label»" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" -msgstr "Завершение работы Ñ ÑоÑтоÑнием неиÑправноÑти Ñ Ð¸Ð·-за возникших ошибок" +msgstr "Завершение работы Ñ ÑоÑтоÑнием неиÑправноÑти из-за возникших ошибок" + +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" #: src/update.c:87 #, c-format @@ -2523,56 +2540,56 @@ msgid "%s: File shrank by %s byte" msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: Файл урезан на %s байт" msgstr[1] "%s: Файл урезан на %s байта" -msgstr[2] "%s: Файл урезан на %s байт" +msgstr[2] "%s: Файл урезан на %s байтов" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "ÐеизвеÑтное или ещё не реализованное ключевое Ñлово %s" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" msgstr "Метка времени за пределами допуÑтимого диапазона" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "Шаблон %s не может быть иÑпользован" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Ключевое Ñлово %s не может быть перекрыто" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "Ðеверно Ñформирован раÑширенный заголовок: отÑутÑтвует длина" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "Длина раÑширенного заголовка %*s за пределами допуÑтимого диапазона" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "" "Ðеверно Ñформирован раÑширенный заголовок: поÑле длины отÑутÑтвует пробел" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "Ðеверно Ñформирован раÑширенный заголовок: отÑутÑтвует знак равенÑтва " -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "" "Ðеверно Ñформирован раÑширенный заголовок: отÑутÑтвует знак новой Ñтроки" -#: src/xheader.c:740 -#, fuzzy, c-format +#: src/xheader.c:741 +#, c-format msgid "Ignoring unknown extended header keyword '%s'" -msgstr "ИгнорируетÑÑ Ð½ÐµÐ¸Ð·Ð²ÐµÑтное ключевое Ñлово раÑширенного заголовка `%s'" +msgstr "ИгнорируетÑÑ Ð½ÐµÐ¸Ð·Ð²ÐµÑтное ключевое Ñлово раÑширенного заголовка «%s»" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" @@ -2581,50 +2598,50 @@ msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "РаÑширенный заголовок %s=%s за пределами диапазона %s..%s" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Ðеверно Ñформирован раÑширенный заголовок: неверный %s=%s" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Ðеверно Ñформирован раÑширенный заголовок: превышен %s=%s" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" "Ðеверно Ñформирован раÑширенный заголовок: неверный %s: непредвиденный " "разделитель %c" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" "Ðеверно Ñформирован раÑширенный заголовок: неверный %s: нечётное чиÑло " "значений" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "%s: недопуÑтимое Ð²Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "%s: неизвеÑтное дейÑтвие контрольной точки" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "запиÑÑŒ" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "чтение" @@ -2632,7 +2649,7 @@ msgstr "чтение" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ð°Ñ Ñ‚Ð¾Ñ‡ÐºÐ° запиÑи %u" @@ -2641,7 +2658,7 @@ msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ð°Ñ Ñ‚Ð¾Ñ‡ÐºÐ° запиÑи %u" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "ÐšÐ¾Ð½Ñ‚Ñ€Ð¾Ð»ÑŒÐ½Ð°Ñ Ñ‚Ð¾Ñ‡ÐºÐ° Ñ‡Ñ‚ÐµÐ½Ð¸Ñ %u" @@ -2855,19 +2872,19 @@ msgid "cannot set time on `%s'" msgstr "невозможно уÑтановить Ð²Ñ€ÐµÐ¼Ñ Ð² `%s'" #: tests/genfile.c:692 -#, fuzzy, c-format +#, c-format msgid "cannot truncate `%s'" -msgstr "не удаётÑÑ Ñ€Ð°Ð·Ð¾Ñ€Ð²Ð°Ñ‚ÑŒ ÑвÑзь Ñ Â«%s»" +msgstr "не удалоÑÑŒ обрезать «%s»" #: tests/genfile.c:701 -#, fuzzy, c-format +#, c-format msgid "command failed: %s" -msgstr "Сбой команды %s" +msgstr "Ñбой команды: %s" #: tests/genfile.c:706 #, c-format msgid "cannot unlink `%s'" -msgstr "не удаётÑÑ Ñ€Ð°Ð·Ð¾Ñ€Ð²Ð°Ñ‚ÑŒ ÑвÑзь Ñ Â«%s»" +msgstr "не удалоÑÑŒ удалить «%s»" #: tests/genfile.c:833 #, c-format @@ -2904,11 +2921,17 @@ msgstr "Команда завершена\n" msgid "--stat requires file names" msgstr "Ð´Ð»Ñ Ð¾Ð¿Ñ†Ð¸Ð¸ --stat нужны имена файлов" -#~ msgid "Cannot get working directory" -#~ msgstr "Ðе удаётÑÑ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ рабочий каталог" +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "--occurrence не может быть иÑпользована Ñ %s" -#~ msgid "sort names to extract to match archive" -#~ msgstr "Ñортировать извлекаемые имена в том же порÑдке, что и в архиве" +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "ÐÐµÐ»ÑŒÐ·Ñ ÐºÐ¾Ð¼Ð±Ð¸Ð½Ð¸Ñ€Ð¾Ð²Ð°Ñ‚ÑŒ --listed-incremental Ñ --newer" + +#~ msgid "--verify cannot be used with %s" +#~ msgstr "--verify не может быть иÑпользована Ñ %s" + +#~ msgid "--preserve-order is not compatible with --listed-incremental" +#~ msgstr "--preserve-order неÑовмеÑтим Ñ --listed-incremental" #~ msgid "Field too long while reading snapshot file" #~ msgstr "Слишком длинное поле при чтении из snapshot-файла" @@ -2919,14 +2942,20 @@ msgstr "Ð´Ð»Ñ Ð¾Ð¿Ñ†Ð¸Ð¸ --stat нужны имена файлов" #~ msgid "Unexpected field value in snapshot file" #~ msgstr "Ðеожиданное Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»Ñ Ð² snapshot-файле" -#~ msgid "Extended header length is out of allowed range" -#~ msgstr "Длина раÑширенного заголовка за пределами допуÑтимого диапазона" +#~ msgid "Cannot get working directory" +#~ msgstr "Ðе удаётÑÑ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ рабочий каталог" + +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: каталог удалён до его чтениÑ" + +#~ msgid "sort names to extract to match archive" +#~ msgstr "Ñортировать извлекаемые имена в том же порÑдке, что и в архиве" #~ msgid "Invalid group" #~ msgstr "ÐедопуÑÑ‚Ð¸Ð¼Ð°Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ð°" -#~ msgid "%s: Directory removed before we read it" -#~ msgstr "%s: каталог удалён до его чтениÑ" +#~ msgid "Extended header length is out of allowed range" +#~ msgstr "Длина раÑширенного заголовка за пределами допуÑтимого диапазона" #~ msgid "Cannot save working directory" #~ msgstr "Ðевозможно Ñохранить рабочий каталог" diff --git a/po/sk.gmo b/po/sk.gmo index 87772c6..fcbd201 100644 Binary files a/po/sk.gmo and b/po/sk.gmo differ diff --git a/po/sk.po b/po/sk.po index 95c5d4d..26740cd 100644 --- a/po/sk.po +++ b/po/sk.po @@ -2,12 +2,12 @@ # Copyright (C) 1997 Free Software Foundation, Inc. # Martin Lacko , 2001. # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" "Project-Id-Version: tar- \n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" "PO-Revision-Date: 2002-02-10 12:00CEST\n" "Last-Translator: Martin Lacko \n" "Language-Team: Slovak \n" @@ -103,7 +103,7 @@ msgstr "" msgid "give a short usage message" msgstr "" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "" @@ -395,11 +395,7 @@ msgstr "" #: gnu/version-etc.c:249 #, fuzzy, c-format msgid "Report %s bugs to: %s\n" -msgstr "" -"\n" -" Chyby v programe oznamujte na adresa (iba anglicky),\n" -"pripomienky k pkekladu zasielajte na adresu " -"(slovensky).\n" +msgstr "Premenovávám %s spä» na %s\n" #: gnu/version-etc.c:253 #, c-format @@ -419,7 +415,7 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: Nedá sa %s" @@ -428,56 +424,56 @@ msgstr "%s: Ned #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: Varovanie: Nedá sa %s" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: Práva nie je mo¾né zmeni» na %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: Vlastníctvo nie je mo¾né zmeni» na uid %lu, gid %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: Odkaz na %s nie je mo¾né vytvori»" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, fuzzy, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Chyba pri èítaní na bajte %s, èítanie %lu bajtov" msgstr[1] "%s: Chyba pri èítaní na bajte %s, èítanie %lu bajtov" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, fuzzy, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Varovanie: Chyba pri èítaní na bajte %s, èítanie %lu bajtov" msgstr[1] "%s: Varovanie: Chyba pri èítaní na bajte %s, èítanie %lu bajtov" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: Nedá sa zmeni» pozícia v súbore na %s" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: Varovanie: Ukazovateµ v súbore nie je mo¾né premiestni» na %s" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: Symbolický odkaz na `%s' nie je mo¾né vytvori»" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, fuzzy, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -578,14 +574,20 @@ msgstr "" #: rmt/rmt.c:664 #, fuzzy msgid "Unexpected arguments" -msgstr "Neoèekávaný koniec archívu" +msgstr "Neoèakávaný koniec v rozsekanom mene" #: rmt/rmt.c:689 +#, fuzzy msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "" +"Pou¾itie: %s [PREPÍNAÈ]\n" +"Manipuluje s archívom, prjíma príkazy vzdialeného procesu.\n" +"\n" +" --version Vypí¹e oznaèenie verzie\n" +" --help Vypí¹e túto nápovedu\n" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "" @@ -593,10 +595,10 @@ msgstr "" msgid "set debug level" msgstr "" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "" @@ -607,7 +609,7 @@ msgstr "" #: rmt/rmt.c:715 rmt/rmt.c:783 #, fuzzy, c-format msgid "cannot open %s" -msgstr "%s: Nedá sa zmeni» pozícia v súbore na %s" +msgstr "Nedá sa zatvori»" #: rmt/rmt.c:780 tests/genfile.c:892 tests/genfile.c:909 #, c-format @@ -618,104 +620,112 @@ msgstr "" msgid "Garbage command" msgstr "Neznámy príkaz" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Toto pravdepodobne nie je tar archiv" -#: src/buffer.c:521 src/buffer.c:530 +#: src/buffer.c:574 +msgid "Total bytes read" +msgstr "" + +#: src/buffer.c:576 #, fuzzy msgid "Total bytes written" msgstr "Celkom zapísané bajtov: %s (%sB, %sB/s)\n" -#: src/buffer.c:528 src/buffer.c:542 -msgid "Total bytes read" -msgstr "" - -#: src/buffer.c:532 -#, fuzzy, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Celkom zapísané bajtov: %s (%sB, %sB/s)\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(rúra)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "Chybná hodnota pre veµkos» záznamu" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Meno archívu nebolo zadané" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Stdin/Stdout archív nie je mo¾né otvori»" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Komprimovaný archív nie je mo¾né aktualizova»" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "Páska na zaèiatku, konèím" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "Príli¹ mnoho chýb, konèím" -#: src/buffer.c:893 +#: src/buffer.c:944 #, fuzzy, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Veµkos» záznamu = %lu blokov" msgstr[1] "Veµkos» záznamu = %lu blokov" -#: src/buffer.c:914 +#: src/buffer.c:965 #, fuzzy, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "Nezarovnaný blok (%lu bajtov) v archíve" msgstr[1] "Nezarovnaný blok (%lu bajtov) v archíve" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "V archíve sa nie je mo¾né vráti», bez -i mô¾e by» neèitateµný" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: vracia chybné èíslo zväzku" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "Èíslo zväzku preteèené" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Pripravte zväzok #%d pre archív %s a stlaète return:" -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "Namiesto u¾ívateµskej odpovede bol zadaný koniec súboru" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "VAROVANIE: Archiv je nekompletný" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, fuzzy, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -727,71 +737,71 @@ msgstr "" " ! Vytvorenie podshellu\n" " ? Vypísanie tejto nápovedy\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Nie je nový zväzok; konèím.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, fuzzy, c-format msgid "%s command failed" msgstr "'%s' príkaz zlyhal" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, fuzzy, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s nepokraèuje na tomto zväzku" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s nepokraèuje na tomto zväzku" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s je chybnej då¾ky (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, fuzzy, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Tento zväzok nie je následníkem predchádzajúceho" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "Pre vyhodnotenie vzorky `%s' musí by» archív pomenovaný" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "Zväzok %s nezodpovedá vzorke %s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "" @@ -802,16 +812,16 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Dá sa èíta» iba %lu z %lu bajtov" msgstr[1] "Dá sa èíta» iba %lu z %lu bajtov" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "Obsah sa lí¹i" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "Neoèekávaný koniec archívu" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "Typ súboru sa lí¹i" @@ -831,7 +841,7 @@ msgstr "Gid sa l msgid "Mod time differs" msgstr "Èas poslednej úpravy sa lí¹i" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Veµkos» sa lí¹i" @@ -848,37 +858,37 @@ msgstr "Symbolick msgid "Device number differs" msgstr "Èíslo zariadenia sa lí¹i" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Overujem " -#: src/compare.c:471 -#, fuzzy, c-format +#: src/compare.c:473 +#, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "%s: Neznámy typ súboru '%c', porovnávaný ako normálny súbor" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "" -#: src/compare.c:533 +#: src/compare.c:535 #, fuzzy msgid "Archive contains transformed file names." msgstr "Archív obsahuje zastaralé base-64 hlavièky" -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "" -#: src/compare.c:612 +#: src/compare.c:614 #, fuzzy, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "CHYBNÉ OVERENIE: nájdených chybných hlavièiek: %d" msgstr[1] "CHYBNÉ OVERENIE: nájdených chybných hlavièiek: %d" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "" @@ -924,55 +934,55 @@ msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "%s: Súbor je krat¹í o : %s bajtov; Doplòujem nulami." msgstr[1] "%s: Súbor je krat¹í o : %s bajtov; Doplòujem nulami." -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: súbor je na inom súborovom systéme; nearchivovaný" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Neznámy typ súboru; súbor ignorovaný" -#: src/create.c:1549 +#: src/create.c:1551 #, fuzzy, c-format msgid "Missing links to %s." msgstr " odkaz na %s\n" -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: súbor nie je zmenený; neaktualizovaný" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: súbor je archiv; nearchivovaný" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: súbor bol poèas èítania zmenený" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: soket ignorovaný" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: dvere ignorované" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Preskakujem na ïal¹iu hlavièku" @@ -1019,13 +1029,13 @@ msgstr "Sk msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Nedá sa rozbali» -- súbor je pokraèovaním iného zväzku" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 #, fuzzy msgid "Unexpected long name header" msgstr "Neoèakávaný koniec v rozsekanom mene" #: src/extract.c:1542 -#, fuzzy, c-format +#, c-format msgid "%s: Unknown file type '%c', extracted as normal file" msgstr "%s: Neznámy typ súboru `%c', rozbalený ako normálny súbor" @@ -1064,156 +1074,156 @@ msgstr "%s: s msgid "%s: Directory has been renamed" msgstr "%s: Adresár bol premenovaný" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "Neplatný èas súboru" -#: src/incremen.c:1045 +#: src/incremen.c:1047 #, fuzzy msgid "Invalid modification time" msgstr "Zadáné chybné práva" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "Neplatné èíslo zariadenia" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Neplatné èíslo i-uzlu" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" msgstr "" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 #, fuzzy msgid "Unexpected EOF in snapshot file" msgstr "Neoèekávaný koniec archívu" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" msgstr "" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" msgstr "" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, fuzzy, c-format msgid "Cannot create temporary directory using template %s" msgstr "Pre blokový faktor (blokov na záznam) %d nie je mo¾né alokovat pamä»" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, fuzzy, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: súbor je na inom súborovom systéme; nearchivovaný" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Ma¾em %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: Nedá sa zmaza»" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: Vynechávam" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "blok %s: ** Blok NUL **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Konec súboru **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Medzery v hlavièke na mieste, kde je oèakávaná èíselná hodnota typu %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1221,96 +1231,96 @@ msgstr "" "complement" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Osmièková hodnota %.*s typu %s je mimo rozsah" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "Archív obsahuje zastaralé base-64 hlavièky" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Hodnota base-64 typu %s je mimo %s rozsah" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Hodnota base-256 typu %s je mimo rozsah" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Archív obsahuje %.*s tam, kde je oèakaváná èísalná hodnota typu %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Hodnota %s typu %s je mimo rozsah %s..%s" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " odkaz na %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " neznámy typ súboru %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Hlavièka zväzku--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Pokraèované od %s bajtu--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Vytváram adresár:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "Premenovávam %s na %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: nie je mo¾né premenova» na %s" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "Premenovávám %s spä» na %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Súbor zmazaný skôr ako mohl by» èítaný" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "potomok" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "meziprocesový kanál" @@ -1320,75 +1330,75 @@ msgid "command line" msgstr "'%s' príkaz zlyhal" #: src/names.c:378 -#, fuzzy, c-format +#, c-format msgid "%s: file list requested from %s already read from %s" -msgstr "%s: súbor je archiv; nearchivovaný" +msgstr "" -#: src/names.c:448 -#, fuzzy, c-format +#: src/names.c:448 src/checkpoint.c:274 +#, c-format msgid "cannot split string '%s': %s" -msgstr "%s: Nedá sa zmeni» pozícia v súbore na %s" +msgstr "" #: src/names.c:490 #, c-format msgid "%s: file name read contains nul character" msgstr "" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: V archíve nenájdený" -#: src/names.c:842 +#: src/names.c:845 #, fuzzy, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: V archíve nenájdený" -#: src/names.c:876 +#: src/names.c:879 #, fuzzy, c-format msgid "Archive label mismatch" msgstr "Pre vyhodnotenie vzorky `%s' musí by» archív pomenovaný" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "Prepínaèe `-%s' a `-%s' vy¾adujú ¹tandardný vstup" -#: src/tar.c:163 +#: src/tar.c:164 #, fuzzy, c-format msgid "%s: Invalid archive format" msgstr "%s: Chybná skupina" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "GNU roz¹írenia po¾adované na nekompatibilnom formáte archívu" -#: src/tar.c:255 +#: src/tar.c:264 #, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." msgstr "" -#: src/tar.c:364 +#: src/tar.c:378 #, fuzzy msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " @@ -1407,7 +1417,7 @@ msgstr "" " %s -tvf archív.tar # Podrobne vypí¹e v¹etky súbory v archív.tar.\n" " %s -xf archív.tar # Rozbalí v¹etky súbory z archív.tar.\n" -#: src/tar.c:373 +#: src/tar.c:387 #, fuzzy msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1433,80 +1443,80 @@ msgstr "" " existujú, inak tvorí jednoduché\n" " never, simple tvorí v¾dy jednoduché zálo¾né kópie súborov\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "" -#: src/tar.c:411 +#: src/tar.c:425 #, fuzzy msgid "create a new archive" msgstr "Neoèekávaný koniec archívu" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1514,614 +1524,640 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "" -#: src/tar.c:471 +#: src/tar.c:485 msgid "don't replace existing files when extracting, treat them as errors" msgstr "" -#: src/tar.c:474 +#: src/tar.c:488 msgid "don't replace existing files when extracting, silently skip over them" msgstr "" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:490 +#: src/tar.c:504 msgid "preserve existing symlinks to directories when extracting" msgstr "" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "" -#: src/tar.c:499 +#: src/tar.c:516 #, fuzzy msgid "extract files to standard output" msgstr "Chyba pri zápise na ¹tandardný výstup" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " "place (METHOD='system')" msgstr "" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" msgstr "" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:554 +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 msgid "Handling of extended file attributes:" msgstr "" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" msgstr "" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" msgstr "" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" msgstr "" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" msgstr "" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" msgstr "" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" msgstr "" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" msgstr "" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" msgstr "" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "" -#: src/tar.c:603 +#: src/tar.c:627 #, fuzzy msgid "create/list/extract multi-volume archive" msgstr "Víczväzkový archív nie je mo¾né otvori»" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:629 +#: src/tar.c:653 #, fuzzy msgid "Archive format selection:" msgstr "Odporujúce si archívne formáty" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:660 +#: src/tar.c:684 #, fuzzy msgid "Compression options:" msgstr "Odporujúce si kompresné prepínaèe" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:687 -msgid "DIR" -msgstr "" - -#: src/tar.c:688 +#: src/tar.c:712 #, fuzzy msgid "change to directory DIR" msgstr "Pracovný adresár nie je mo¾né zmeni»" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +msgid "unquote input file or member names (default)" msgstr "" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +msgid "do not unquote input file or member names" msgstr "" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:729 +#: src/tar.c:761 #, fuzzy msgid "don't strip leading '/'s from file names" msgstr "Odstraòujem úvodné `%.*s' z názvov súborov" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:735 +#: src/tar.c:767 msgid "begin at member MEMBER-NAME when reading the archive" msgstr "" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "" -#: src/tar.c:767 +#: src/tar.c:799 msgid "patterns match after any '/' (default for exclusion)" msgstr "" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "" -#: src/tar.c:775 +#: src/tar.c:807 #, fuzzy msgid "wildcards do not match '/'" msgstr "Zväzok %s nezodpovedá vzorke %s" -#: src/tar.c:777 +#: src/tar.c:809 msgid "wildcards match '/' (default for exclusion)" msgstr "" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2129,316 +2165,309 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:802 -#, fuzzy +#: src/tar.c:834 msgid "print file modification times in UTC" -msgstr "Zadáné chybné práva" +msgstr "" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:978 +#: src/tar.c:1010 #, fuzzy msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" msgstr "Viac ako jeden prepínaè `-Acdtrux' nemô¾e by» zadaných" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Odporujúce si kompresné prepínaèe" -#: src/tar.c:1047 +#: src/tar.c:1079 #, fuzzy, c-format msgid "Unknown signal name: %s" msgstr " neznámy typ súboru %s\n" -#: src/tar.c:1071 +#: src/tar.c:1103 #, fuzzy msgid "Date sample file not found" msgstr "Dátumový súbor nebol nájdený" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Zamieòam %s za neznámy dátumový formát %s" -#: src/tar.c:1108 +#: src/tar.c:1140 #, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 -#, fuzzy, c-format +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 +#, c-format msgid "filter the archive through %s" -msgstr "%s: súbor je archiv; nearchivovaný" +msgstr "" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1295 +#: src/tar.c:1330 #, fuzzy msgid "Invalid owner or group ID" msgstr "Neplatný vlastník" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Neplatný poèet bajtov na záznam" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "Neplatná då¾ka pásky" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "Viac ako jeden poèiatoèný dátum" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Zadáné chybné práva" -#: src/tar.c:1858 +#: src/tar.c:1925 #, fuzzy msgid "Invalid number" msgstr "Neplatné èíslo i-uzlu" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Chybná veµkos» záznamu" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "Veµkos» záznamu musí by» násobok %d." -#: src/tar.c:1975 +#: src/tar.c:2042 #, fuzzy msgid "Invalid number of elements" msgstr "Neplatná då¾ka pásky" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:2133 -#, fuzzy, c-format +#: src/tar.c:2205 +#, c-format msgid "Unknown density: '%c'" -msgstr " neznámy typ súboru %s\n" +msgstr "" -#: src/tar.c:2150 +#: src/tar.c:2222 #, fuzzy, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "Prepínaè `-[0-7][lmh]' nie je podporovaný týmto tarom" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "" -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 +#, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "%s: Nedá sa zmeni» pozícia v súbore na %s" + +#: src/tar.c:2389 #, fuzzy, c-format msgid "Old option '%c' requires an argument." msgstr "Prepínaè `%c' vy¾aduje argument." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2389 -#, c-format -msgid "--occurrence cannot be used with %s" -msgstr "" - -#: src/tar.c:2408 +#: src/tar.c:2490 #, fuzzy msgid "Multiple archive files require '-M' option" msgstr "Viac archivaèných súborov vy¾aduje prepínaè `-M'" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "--listed-incremental a --newer nie je mo¾né kombinova»" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "" -#: src/tar.c:2433 +#: src/tar.c:2515 #, fuzzy, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "%s: Meno zväzku je príli¹ dlhé (limit je %lu bajtov)" msgstr[1] "%s: Meno zväzku je príli¹ dlhé (limit je %lu bajtov)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Víczväzkový archív nie je mo¾né otvori»" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Komprimovaný archív nie je mo¾né otvori»" -#: src/tar.c:2450 -#, c-format -msgid "--verify cannot be used with %s" -msgstr "" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Viaczväzkový komprimovaný archív nie je mo¾né vytvori»" -#: src/tar.c:2461 +#: src/tar.c:2543 #, fuzzy msgid "Cannot concatenate compressed archives" msgstr "Komprimovaný archív nie je mo¾né aktualizova»" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2478 +#: src/tar.c:2560 msgid "--acls can be used only on POSIX archives" msgstr "" -#: src/tar.c:2483 +#: src/tar.c:2565 msgid "--selinux can be used only on POSIX archives" msgstr "" -#: src/tar.c:2488 +#: src/tar.c:2570 msgid "--xattrs can be used only on POSIX archives" msgstr "" -#: src/tar.c:2493 -#, c-format -msgid "--%s option cannot be used with %s" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "Vytvorenie prázdneho archívu odmietnuté." -#: src/tar.c:2565 +#: src/tar.c:2669 #, fuzzy msgid "Options '-Aru' are incompatible with '-f -'" msgstr "Prepínaèe `-Aru' a `--delete' sú nezlúèiteµné s prepínaèom `-f -'" -#: src/tar.c:2660 +#: src/tar.c:2766 #, fuzzy msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" msgstr "Musíte zada» jeden z prepínaèov `-Acdtrux'" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, fuzzy, c-format msgid "%s: File shrank by %s byte" @@ -2446,99 +2475,99 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: Súbor skrátený o bajtov: %s" msgstr[1] "%s: Súbor skrátený o bajtov: %s" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "" -#: src/xheader.c:173 +#: src/xheader.c:174 #, fuzzy msgid "Time stamp is out of allowed range" msgstr "Èas súboru mimo rozsah" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "" -#: src/xheader.c:676 +#: src/xheader.c:677 #, fuzzy, c-format msgid "Extended header length %*s is out of range" msgstr "Hodnota base-64 typu %s je mimo %s rozsah" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "" -#: src/xheader.c:740 +#: src/xheader.c:741 #, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, fuzzy, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "Hodnota %s typu %s je mimo rozsah %s..%s" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, fuzzy, c-format msgid "%s: not a valid timeout" msgstr "%s: Chybná skupina" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "" @@ -2546,7 +2575,7 @@ msgstr "" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, fuzzy, c-format msgid "Write checkpoint %u" msgstr "Zapisujem testovací bod %d" @@ -2555,7 +2584,7 @@ msgstr "Zapisujem testovac #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, fuzzy, c-format msgid "Read checkpoint %u" msgstr "Èítanie testovacieho bodu %d" @@ -2626,11 +2655,8 @@ msgid "Synchronous execution options:" msgstr "" #: tests/genfile.c:163 -#, fuzzy msgid "OPTION" msgstr "" -"\n" -"Pou¾itie: %s [PREPÍNAÈ]...\n" #: tests/genfile.c:164 msgid "" @@ -2761,7 +2787,7 @@ msgstr "%s: Ned #: tests/genfile.c:692 #, fuzzy, c-format msgid "cannot truncate `%s'" -msgstr "%s: Nedá sa zmeni» pozícia v súbore na %s" +msgstr "%s: nie je mo¾né premenova» na %s" #: tests/genfile.c:701 #, fuzzy, c-format @@ -2771,7 +2797,7 @@ msgstr "'%s' pr #: tests/genfile.c:706 #, fuzzy, c-format msgid "cannot unlink `%s'" -msgstr "%s: Nedá sa zmeni» pozícia v súbore na %s" +msgstr "%s: Odkaz na `%s' nie je mo¾né vytvori»" #: tests/genfile.c:833 #, c-format @@ -2808,87 +2834,12 @@ msgstr "" msgid "--stat requires file names" msgstr "--Rozdelené meno súboru--\n" -#, fuzzy -#~ msgid "Cannot get working directory" -#~ msgstr "Pracovný adresár nie je mo¾né zmeni»" - -#, fuzzy -#~ msgid "Invalid group" -#~ msgstr "%s: Chybná skupina" - -#, fuzzy -#~ msgid "%s: Directory removed before we read it" -#~ msgstr "%s: Súbor zmazaný skôr ako mohl by» èítaný" - -#, fuzzy -#~ msgid "Cannot restore working directory" -#~ msgstr "Pracovný adresár nie je mo¾né uchova»" - -#, fuzzy -#~ msgid "Cannot resolve hostname %s" -#~ msgstr "%s: nie je mo¾né premenova» na %s" +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "--listed-incremental a --newer nie je mo¾né kombinova»" #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: neznámy prepínaè -- %c\n" -#~ msgid "Reading %s\n" -#~ msgstr "Èítanie z %s\n" - -#, fuzzy -#~ msgid "" -#~ "\n" -#~ "Report bugs to <%s>.\n" -#~ msgstr "" -#~ "\n" -#~ " Chyby v programe oznamujte na adresa (iba anglicky),\n" -#~ "pripomienky k pkekladu zasielajte na adresu " -#~ "(slovensky).\n" - -#, fuzzy -#~ msgid "filter the archive through compress" -#~ msgstr "%s: súbor je archiv; nearchivovaný" - -#, fuzzy -#~ msgid "filter the archive through lzma" -#~ msgstr "%s: súbor je archiv; nearchivovaný" - -#, fuzzy -#~ msgid "filter the archive through lzop" -#~ msgstr "%s: súbor je archiv; nearchivovaný" - -#~ msgid "rmtd: Cannot allocate buffer space\n" -#~ msgstr "rmtd: Miesto pre buffer nie je mo¾né alokova»\n" - -#~ msgid "Cannot allocate buffer space" -#~ msgstr "Miesto pre buffer nie je mo¾né alokova»" - -#~ msgid "Try `%s --help' for more information.\n" -#~ msgstr "Viac informácií získate príkazom `%s --help'.\n" - -#, fuzzy -#~ msgid "" -#~ "Usage: %s [OPTION]\n" -#~ "Manipulate a tape drive, accepting commands from a remote process.\n" -#~ "\n" -#~ " --version Output version info.\n" -#~ " --help Output this help.\n" -#~ msgstr "" -#~ "Pou¾itie: %s [PREPÍNAÈ]\n" -#~ "Manipuluje s archívom, prjíma príkazy vzdialeného procesu.\n" -#~ "\n" -#~ " --version Vypí¹e oznaèenie verzie\n" -#~ " --help Vypí¹e túto nápovedu\n" - -#, fuzzy -#~ msgid "Seek offset error" -#~ msgstr "Veµkos» pozície v súbore je mimo rozsah" - -#~ msgid "Premature end of file" -#~ msgstr "Predèasný koniec súboru" - -#~ msgid "Error is not recoverable: exiting now" -#~ msgstr "Z chyby sa nie je mo¾né zotavi»: ukonèuje sa" - #~ msgid "block size" #~ msgstr "veµkos» bloku" @@ -2904,6 +2855,9 @@ msgstr "--Rozdelen #~ msgid "tar (grandchild)" #~ msgstr "tar (prapotomok)" +#~ msgid "Reading %s\n" +#~ msgstr "Èítanie z %s\n" + #~ msgid "WARNING: No volume header" #~ msgstr "VAROVANIE: Chýba hlavièka zväzku" @@ -2919,6 +2873,9 @@ msgstr "--Rozdelen #~ msgid "Visible long name error" #~ msgstr "Viditeµná chyba dlhého mena" +#~ msgid "Error is not recoverable: exiting now" +#~ msgstr "Z chyby sa nie je mo¾né zotavi»: ukonèuje sa" + #~ msgid "Device number out of range" #~ msgstr "Èíslo zariadenia je mimo rozsah" @@ -2928,9 +2885,6 @@ msgstr "--Rozdelen #~ msgid "Renamed %s to %s" #~ msgstr "Súbor %s premenovaný na %s" -#~ msgid "%s: Cannot symlink to %s" -#~ msgstr "%s: Odkaz na `%s' nie je mo¾né vytvori»" - #~ msgid "Symlinked %s to %s" #~ msgstr "%s odkazuje na %s" @@ -2940,6 +2894,12 @@ msgstr "--Rozdelen #~ msgid "Missing file name after -C" #~ msgstr "Za -C chýba meno súboru" +#~ msgid "rmtd: Cannot allocate buffer space\n" +#~ msgstr "rmtd: Miesto pre buffer nie je mo¾né alokova»\n" + +#~ msgid "Cannot allocate buffer space" +#~ msgstr "Miesto pre buffer nie je mo¾né alokova»" + #~ msgid "" #~ "This program comes with NO WARRANTY, to the extent permitted by law.\n" #~ "You may redistribute it under the terms of the GNU General Public " @@ -2954,6 +2914,9 @@ msgstr "--Rozdelen #~ "textoch\n" #~ "v súbore COPYING." +#~ msgid "Premature end of file" +#~ msgstr "Predèasný koniec súboru" + #~ msgid "rmtd: Garbage command %c\n" #~ msgstr "rmtd: Neznámy príkaz %c\n" diff --git a/po/sl.gmo b/po/sl.gmo index e9ac3a4..0287da6 100644 Binary files a/po/sl.gmo and b/po/sl.gmo differ diff --git a/po/sl.po b/po/sl.po index 049c1b3..6f70381 100644 --- a/po/sl.po +++ b/po/sl.po @@ -1,16 +1,16 @@ # -*- mode: po; coding: utf-8; -*- Slovenian message catalog for GNU Tar -# Copyright (C) 1996, 1999, 2000, 2001, 2005, 2006, 2007, 2009, 2011 Free Software Foundation, Inc. +# Copyright (C) 1996, 1999, 2000, 2001, 2005, 2006, 2007, 2009, 2011, 2013 Free Software Foundation, Inc. # This file is distributed under the same license as the tar package. -# Primož Peterlin , 1996, 1999, 2000, 2001, 2005, 2006, 2007, 2009, 2011. +# Primož Peterlin , 1996, 1999, 2000, 2001, 2005, 2006, 2007, 2009, 2011, 2013. # -# $Id: tar-1.26.sl.po,v 1.2 2011/03/12 16:30:39 peterlin Exp $ -#: src/create.c:1572 +# $Id: tar-1.27.sl.po,v 1.3 2013/12/13 21:58:56 peterlin Exp $ +#: src/create.c:1574 msgid "" msgstr "" -"Project-Id-Version: tar 1.26\n" +"Project-Id-Version: tar 1.27\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" -"PO-Revision-Date: 2011-03-12 17:30+0100\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" +"PO-Revision-Date: 2013-12-13 22:58+0100\n" "Last-Translator: Primož Peterlin \n" "Language-Team: Slovenian \n" "Language: sl\n" @@ -80,7 +80,7 @@ msgid " [OPTION...]" msgstr " [IZBIRA...]" #: gnu/argp-help.c:1686 -#, fuzzy, c-format +#, c-format msgid "Try '%s --help' or '%s --usage' for more information.\n" msgstr "Poskusite »%s --help« ali »%s --usage« za izÄrpnejÅ¡a navodila.\n" @@ -101,7 +101,7 @@ msgstr "poda ta seznam pomoÄi" msgid "give a short usage message" msgstr "poda kratka navodila za uporabo" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "IME" @@ -140,9 +140,9 @@ msgid "write error" msgstr "napaka pri pisanju" #: gnu/getopt.c:549 gnu/getopt.c:578 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: izbira »%s« ni enopomenska\n" +msgstr "%s: izbira »%s« ni enopomenska; možnosti so:" #: gnu/getopt.c:626 gnu/getopt.c:630 #, c-format @@ -437,7 +437,7 @@ msgstr "SploÅ¡na pomoÄ za rabo programja GNU: \n" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: Klic funkcije %s ni uspel" @@ -447,27 +447,27 @@ msgstr "%s: Klic funkcije %s ni uspel" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: Opozorilo: Klic funkcije %s ni uspel" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: ZaÅ¡Äite ni mogoÄe spremeniti na %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: Ni mogoÄe spremeniti lastnika in skupina na UID %lu GID %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: Trda povezava na %s ni mogoÄa" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" @@ -476,7 +476,7 @@ msgstr[1] "%s: Napaka pri branju pri bajtu %s, med branjem %lu bajta" msgstr[2] "%s: Napaka pri branju pri bajtu %s, med branjem %lu bajtov" msgstr[3] "%s: Napaka pri branju pri bajtu %s, med branjem %lu bajtov" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" @@ -485,22 +485,22 @@ msgstr[1] "%s: Opozorilo: Napaka pri branju pri bajtu %s, prebran %lu bajt" msgstr[2] "%s: Opozorilo: Napaka pri branju pri bajtu %s, prebrana %lu bajta" msgstr[3] "%s: Opozorilo: Napaka pri branju pri bajtu %s, prebrani %lu bajti" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: Pozicioniranje na %s ni mogoÄe" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: Opozorilo: Pozicioniranje na %s ni mogoÄe" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: Ni mogoÄe ustvariti simbolne povezave na %s" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -512,20 +512,20 @@ msgstr[3] "%s: Zapisani samo %lu od skupno %lu bajtov" #: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" -msgstr "Odstranjujemo vodilne »%s« iz imen elementov" +msgstr "Odstranjevanje vodilnih »%s« iz imen elementov" #: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" -msgstr "Odstranjujemo vodilne »%s« iz imen trdih povezav" +msgstr "Odstranjevanje vodilnih »%s« iz imen trdih povezav" #: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" -msgstr "NadomeÅ¡Äamo manjkajoÄa imena elementov s ».«" +msgstr "Prazno ime elementa se nadomeÅ¡Äa s ».«" #: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" -msgstr "NadomeÅ¡Äamo manjkajoÄa imena trdih povezav s ».«<" +msgstr "ManjkajoÄi cilj trde povezave se nadomeÅ¡Äa s ».«" #: lib/rtapelib.c:299 #, c-format @@ -548,9 +548,9 @@ msgid "Cannot connect to %s: resolve failed" msgstr "Priklop na %s ni mogoÄ: razreÅ¡itev ni uspela" #: lib/rtapelib.c:502 -#, fuzzy, c-format +#, c-format msgid "Cannot redirect files for remote shell" -msgstr "Ni mogoÄe pognati nelokalne ukazne lupine" +msgstr "Ni mogoÄe preusmerjati datotek za nelokalno ukazno lupino" #: lib/rtapelib.c:516 #, c-format @@ -601,8 +601,8 @@ msgstr "NepriÄakovani argumenti" msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "Nadzor traÄne enote, ki bere ukaze iz drugega procesa" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "N" @@ -610,10 +610,10 @@ msgstr "N" msgid "set debug level" msgstr "nastavi raven iskanja napak" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "DATOTEKA" @@ -635,59 +635,67 @@ msgstr "preveÄ argumentov" msgid "Garbage command" msgstr "Neveljaven ukaz" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "To ne deluje kot arhiv ,tar'" -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" -msgstr "Skupno zapisanih bajtov" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" msgstr "Skupno prebranih bajtov" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "Skupno zapisanih bajtov" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Skupno izbrisanih bajtov: %s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(cev)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "Neveljavna vrednost za dolžino zapisa (record_size)" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Ime arhiva ni podano" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Arhivov na stdin/stdout ni mogoÄe preveriti" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Arhiv je stisnjen. Uporabite izbiro %s" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Stisnjenega arhiva ni mogoÄe ažurirati" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "Na zaÄetku traku, konÄujem" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "PreveÄ napak, konÄujem" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" @@ -696,7 +704,7 @@ msgstr[1] "Dolžina zapisa = %lu blok" msgstr[2] "Dolžina zapisa = %lu bloka" msgstr[3] "Dolžina zapisa = %lu bloki" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" @@ -705,37 +713,37 @@ msgstr[1] "Neporavnan blok (%lu bajt) v arhivu" msgstr[2] "Neporavnan blok (%lu bajta) v arhivu" msgstr[3] "Neporavnan blok (%lu bajti) v arhivu" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "Nazaj po arhivu ne gre, morda ni berljiv brez izbire -i" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek se ni ustavil na meji zapisa" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: vsebuje neveljavno Å¡tevilko dela" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "PrekoraÄitev Å¡tevilke dela" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Pripravite del #%d za %s in pritisnite Return: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "Znak EOF na mestu, kjer se priÄakuje odgovor uporabnika" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "POZOR: Arhiv nepopoln" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -746,65 +754,65 @@ msgstr "" " q KonÄamo tar\n" " y, newline Nadaljujemo z delovanjem\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Poženemo ukazno podlupino\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? Ta seznam uzazov\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Novega dela ni, konec.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "Ime datoteke ni doloÄeno. Poskusite znova.\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Neveljaven vnos. Vtipkajte ? za pomoÄ.\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "ukaz %s neuspeÅ¡en" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s se morda nadaljuje v tem delu: zaglavje vsebuje porezano ime" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s se ne nadaljuje v tem delu" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s je napaÄne velikosti (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Ta del ne sodi v zaporedje (%s - %s != %s)" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "Arhiv ni oznaÄen skladno z %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "Del %s ne ustreza %s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -812,7 +820,7 @@ msgstr "" "%s: ime datoteke je predolgo za zapis v zaglavje GNU veÄdelnega arhiva; " "porezano" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "pisanje se ni konÄalo s koncem bloka" @@ -825,16 +833,16 @@ msgstr[1] "Prebrati je bilo moÄ samo %lu od %lu bajta" msgstr[2] "Prebrati je bilo moÄ samo %lu od %lu bajtov" msgstr[3] "Prebrati je bilo moÄ samo %lu od %lu bajtov" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "Vsebina se razlikuje" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "NepriÄakovan znak za konec datoteke v arhivu" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "Zvrst datoteke se razlikuje" @@ -854,7 +862,7 @@ msgstr "Å tevilka skupine (GID) se razlikuje" msgid "Mod time differs" msgstr "ÄŒas zadnje spremembe se razlikuje" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Velikost se razlikuje" @@ -871,29 +879,29 @@ msgstr "Simbolna povezava se razlikuje" msgid "Device number differs" msgstr "Å tevilka enote se razlikuje" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Preverjanje " -#: src/compare.c:471 -#, fuzzy, c-format +#: src/compare.c:473 +#, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "%s: Neznana vrsta datoteke »%c«, diff kot na navadni datoteki" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "Arhiv vsebuje imena datotek z odstranjenimi vodilnimi predponami." -#: src/compare.c:533 +#: src/compare.c:535 msgid "Archive contains transformed file names." msgstr "Arhiv vsebuje transformirana imena datotek." -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "Verifikacija morda ne bo uspela locirati izvornih datotek." -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" @@ -902,7 +910,7 @@ msgstr[1] "NAPAKA PRI PREVERJANJU: najdena %d neveljavna glava" msgstr[2] "NAPAKA PRI PREVERJANJU: najdeni %d neveljavni glavi" msgstr[3] "NAPAKA PRI PREVERJANJU: najdene %d neveljavne glave" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "Osamljeni niÄelni blok pri %s" @@ -950,56 +958,56 @@ msgstr[1] "%s: Datoteka skrÄena za %s bajt; dopolnjeno z niÄlami" msgstr[2] "%s: Datoteka skrÄena za %s bajta; dopolnjeno z niÄlami" msgstr[3] "%s: Datoteka skrÄena za %s bajte; dopolnjeno z niÄlami" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: datoteka je na drugem datoteÄnem sistemu; brez iznosa" # POZOR Imamo za to kak izraz? -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "vsebina ni izneÅ¡ena" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Neznan tip datoteke; datoteka ignorirana" -#: src/create.c:1549 +#: src/create.c:1551 #, c-format msgid "Missing links to %s." msgstr "Manjkajo povezave na %s." -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: datoteka je nespremenjena; brez iznosa" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: datoteka je arhiv; brez iznosa" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "imenik ni izneÅ¡en" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: Datoteka je bila spremenjena med branjem" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: vtiÄnica ignorirana" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: vrata ignorirana" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Preskok na naslednjo glavo" @@ -1025,7 +1033,7 @@ msgstr "%s: NepriÄakovana neskladnost pri ustvarjanju imenika" #: src/extract.c:705 #, c-format msgid "%s: skipping existing file" -msgstr "" +msgstr "%s: obstojeÄa datoteka se preskoÄi" #: src/extract.c:821 #, c-format @@ -1036,7 +1044,7 @@ msgstr "%s: Imenik preimenovan, preden je bilo moÄ restavrirati njegov status" # na zaporednih sektorjih (na tistih OS, ki jih podpirajo). #: src/extract.c:1010 msgid "Extracting contiguous files as regular files" -msgstr "Neprekinjene datoteke restavriramo kot navadne" +msgstr "Neprekinjene datoteke se restavrirajo kot navadne" # POZOR! Grdo! #: src/extract.c:1365 @@ -1048,14 +1056,14 @@ msgstr "Simbolne povezave poskusimo dearhivirati kot trde" msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Dearhivacija ni mogoÄa - datoteka se nadaljuje iz prejÅ¡njega dela" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" msgstr "NepriÄakovano zaglavje z dolgim imenom" #: src/extract.c:1542 -#, fuzzy, c-format +#, c-format msgid "%s: Unknown file type '%c', extracted as normal file" -msgstr "%s: Neznana vrsta datoteke »%c«, dearhiviramo kot navadno datoteko" +msgstr "%s: Neznana vrsta datoteke »%c«, restavrira se kot navadna datoteka" #: src/extract.c:1568 #, c-format @@ -1083,291 +1091,292 @@ msgid "%s: Directory is new" msgstr "%s: Imenik je nov" #: src/incremen.c:566 -#, fuzzy, c-format +#, c-format msgid "%s: directory is on a different filesystem; not dumped" -msgstr "%s: datoteka je na drugem datoteÄnem sistemu; brez iznosa" +msgstr "%s: imenik je na drugem datoteÄnem sistemu; brez iznosa" #: src/incremen.c:587 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Imenik je bil preimenovan" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "Neveljavna oznaka Äasa" -#: src/incremen.c:1045 -#, fuzzy +#: src/incremen.c:1047 msgid "Invalid modification time" -msgstr "Neveljaven Äas spremembe (sekunde)" +msgstr "Neveljaven Äas spremembe" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "Neveljaven Äas spremembe (nanosekunde)" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "Neveljavna Å¡tevilka enote" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Neveljavna Å¡tevilka inoda" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" -msgstr "" +msgstr "%s: bajt %s: %s %.*s... predolgo" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" msgstr "NepriÄakovan znak za konec datoteke v trenutnem posnetku" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" -msgstr "" +msgstr "%s: bajt %s: %s %s sledi neveljaven bajt 0x%02x" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" +"%s: bajt %s: (veljavni razpon %s..%s)\n" +"\t%s %s" -#: src/incremen.c:1176 -#, fuzzy, c-format +#: src/incremen.c:1178 +#, c-format msgid "%s: byte %s: %s %s" -msgstr "%s: Simbolna povezava %s %s ni mogoÄa" +msgstr "%s: bajt %s: %s %s" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" -msgstr "" +msgstr "%s: bajt %s: %s" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "ManjkajoÄ zakljuÄek zapisa" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "Okvarjen inkrementalni zapis datoteke" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "Nepodprta razliÄica inkrementalnega zapisa: %" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Skladenjska napaka pri imeniku za iznos: priÄakovan »%c«, najden %#3o" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Skladenjska napaka pri imeniku za iznos: »X« podvojen" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Skladenjska napaka pri imeniku za iznos: manjkajoÄe ime pri »R«" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" "Skladenjska napaka pri imeniku za iznos: polja »T« ne predhodi polje »R«" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Skladenjska napaka pri imeniku za iznos: manjkajoÄe ime pri »T«" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" "Skladenjska napaka pri imeniku za iznos: priÄakovan »%c«, najden konec " "podatkov" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "Skladenjska napaka pri imeniku za iznos: »X« ni uporabljen" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Ni mogoÄe ustvariti zaÄasnega imenika po Å¡abloni %s" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Imenika ne Äistimo: statistika zanj ni dosegljiva" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: imenik je na drugi napravi; brez ÄiÅ¡Äenja" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" -msgstr "%s: BriÅ¡emo %s\n" +msgstr "%s: Brisanje %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: Odstranitev ni mogoÄa" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: IzpuÅ¡Äeno" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "blok %s: ** Blok znakov NUL **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Konec datoteke **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" -msgstr "Na mestu v glavi, kjer priÄakujemo Å¡tevilÄno vrednost %s, so presledki" +msgstr "" +"Na mestu v glavi, kjer se priÄakuje Å¡tevilÄno vrednost %s, so presledki" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" -"OsmiÅ¡ka vrednost arhiva %.*s izven obsega %s; privzemamo dvojiÅ¡ki komplement" +"OsmiÅ¡ka vrednost arhiva %.*s izven obsega %s; privzema se dvojiÅ¡ki komplement" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "OsmiÅ¡ka vrednost arhiva %.*s izven obsega %s" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "Arhiv vsebuje zastarele glave oblike base-64" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Podpis %s oblike base-64 v arhivu je izven obsega %s" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Vrednost base-256 v arhivu izven obsega %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" -msgstr "Arhiv vsebuje %.*s na mestu, kjer priÄakujemo Å¡tevilÄno vrednost %s" +msgstr "Arhiv vsebuje %.*s na mestu, kjer se priÄakuje Å¡tevilÄno vrednost %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Vrednost arhiva %s je izven obsega %s: %s..%s" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " povezava na %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " neznan tip datoteke %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--Dolga povezava--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--Dolgo ime--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Glava dela--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Nadaljevanje pri bajtu %s--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" -msgstr "Ustvarjamo imenik:" +msgstr "Ustvarja se imenik:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" -msgstr "Preimenujemo %s v %s\n" +msgstr "Preimenovanje %s v %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Preimenovanje v %s ni mogoÄe" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" -msgstr "Preimenujemo %s nazaj v %s\n" +msgstr "Preimenovanje %s nazaj v %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" -msgstr "%s: Datoteka je bila odstranjena, preden smo jo prebrali" +msgstr "%s: Datoteka je bila odstranjena, preden jo je bilo mogoÄe prebrati" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "proces naslednik" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "medprocesni kanal" #: src/names.c:360 -#, fuzzy msgid "command line" -msgstr "ukaz %s neuspeÅ¡en" +msgstr "ukazna vrstica" #: src/names.c:378 -#, fuzzy, c-format +#, c-format msgid "%s: file list requested from %s already read from %s" -msgstr "%s: seznam datotek je že prebran" +msgstr "%s: seznam datotek, ki ga zahteva %s, je že prebran iz %s" -#: src/names.c:448 -#, fuzzy, c-format +#: src/names.c:448 src/checkpoint.c:274 +#, c-format msgid "cannot split string '%s': %s" -msgstr "ni mogoÄe nastaviti Äasa za »%s«" +msgstr "ni mogoÄe razcepiti niza »%s«: %s" #: src/names.c:490 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: prebrano ime datoteke vsebuje znak \\0" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "Z vzorcem ujemajoÄi se znaki, uporabljeni v imenih datotek" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1375,54 +1384,53 @@ msgstr "" "Uporabite --wildcards, da bi omogoÄili ujemanje vzorcev, ali --no-wildcards, " "da izklopite to opozorilo" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: Ni najdeno v arhivu" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Zahtevane pojavitve ni moÄ najti v arhivu" -#: src/names.c:876 +#: src/names.c:879 #, c-format msgid "Archive label mismatch" msgstr "Neskladje v oznaki arhiva" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "Izbira -C znotraj seznama datotek pri --listed-incremential ni dovoljena" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Samo ena izbira -C je dovoljena pri --listed-incremential" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "Izbiri »-%s« in »-%s« obe zahtevata standardni vhod" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s: Neveljavna oblika arhiva" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "RazÅ¡iritve GNU izbrane na nezdružljivem formatu arhiva" -#: src/tar.c:255 -#, fuzzy, c-format +#: src/tar.c:264 +#, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." msgstr "" -"Neznan slog narekovajev »%s«. Poskusite »%s --quoting-style=help« za seznam." +"Neznan slog navajanja »%s«. Poskusite »%s --quoting-style=help« za seznam." -#: src/tar.c:364 -#, fuzzy +#: src/tar.c:378 msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1436,15 +1444,14 @@ msgstr "" "lahko povrne posamezne datoteke iz arhiva.\n" "\n" "Zgledi:\n" -" tar -cf arhiv.tar prva druga # Ustvarimo arhiv.tar z datotekama prva in " +" tar -cf arhiv.tar prva druga # Ustvari arhiv.tar z datotekama prva in " "druga.\n" " tar -tvf arhiv.tar # IzÄrpen seznam datotek v arhivu arhiv." "tar.\n" -" tar -xf arhiv.tar # Restavriramo vse datoteke iz arhiva arhiv." +" tar -xf arhiv.tar # Restavrira vse datoteke iz arhiva arhiv." "tar.\n" -#: src/tar.c:373 -#, fuzzy +#: src/tar.c:387 msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" "The version control may be set with --backup or VERSION_CONTROL, values " @@ -1455,11 +1462,10 @@ msgid "" " nil, existing numbered if numbered backups exist, simple otherwise\n" " never, simple always make simple backups\n" msgstr "" -"Pripona varnostne kopije je »~«, razen Äe ni drugaÄe doloÄeno z izbiro --" -"suffix\n" -"ali s spremenljivko SIMPLE_BACKUP_SUFFIX. Vrsto varnostne kopije lahko " -"doloÄimo\n" -"z izbiro --backup ali s spremenljivko VERSION_CONTROL. Vrednosti so:\n" +"Pripona varnostne kopije je »~«, razen Äe ni drugaÄe doloÄeno z izbiro\n" +"--suffix ali s spremenljivko SIMPLE_BACKUP_SUFFIX. Vrsto varnostne kopije\n" +"lahko doloÄimo z izbiro --backup ali s spremenljivko VERSION_CONTROL.\n" +"Vrednosti so:\n" "\n" " none, off nikoli ne izdeluj varnostnih kopij\n" " t, numbered oÅ¡tevilÄene varnostne kopije\n" @@ -1467,79 +1473,79 @@ msgstr "" " sicer enostavne\n" " never, simple vedno enostavne varnostne kopije\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "Glavni naÄini delovanja:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "izpiÅ¡i vsebino arhiva" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "restavriraj datoteke iz arhiva" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "ustvarjanje novega arhiva" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "iskanje razlik med arhivom in datoteÄnim sistemom" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "dodajanje datotek na konec arhiva" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "dodajanje novih datotek, Äe so novejÅ¡e od že arhiviranih" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "zlivanje arhivov" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "brisanje datotek iz arhiva (ne deluje na traku!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "preizkusi oznako dela arhiva in zakljuÄi" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "DoloÄila delovanja:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "ekonomiÄno ravnanje z razprÅ¡enimi datotekami" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "GLAVNI[.POMOŽNI]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "izberi uporabljeno razliÄico razprÅ¡enega zapisa (implicira --sparse)" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "stari zapis GNU za inkrementalne arhive" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "novi zapis GNU za inkrementalne arhive" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "raven izmeta za ustvarjene inkrementalne arhive" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "nadaljuj z branjem, tudi Äe datoteke ni moÄ prebrati" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1551,134 +1557,143 @@ msgstr "" "list, pri Äemer je seznam datotek podan bodisi v ukazni vrstici, bodisi z " "izbiro -T. Privzeta vrednost N je 1." -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "po arhivu je mogoÄe iskati" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "po arhivu ni mogoÄe iskati" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "pri izdelavi inkrementalnega arhiva ne preverjaj Å¡tevilke naprav" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" "pri izdelavi inkrementalnega arhiva preverjaj Å¡tevilke naprav (privzeto)" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "Nadzor nad pisanjem prek:" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "s poskusom preverjanja zapisanega arhiva" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "pobriÅ¡i datoteke, potem ko so arhivirane" -#: src/tar.c:471 -#, fuzzy +#: src/tar.c:485 msgid "don't replace existing files when extracting, treat them as errors" -msgstr "pri restavriranju ne piÅ¡i prek obstojeÄih datotek" +msgstr "" +"pri restavriranju ne piÅ¡i prek obstojeÄih datotek, ampak jih obravnavaj kot " +"napako" -#: src/tar.c:474 -#, fuzzy +#: src/tar.c:488 msgid "don't replace existing files when extracting, silently skip over them" -msgstr "pri restavriranju ne piÅ¡i prek obstojeÄih datotek" +msgstr "" +"pri restavriranju ne piÅ¡i prek obstojeÄih datotek, preskoÄi jih brez " +"opozorila" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "ne piÅ¡i prek obstojeÄih datotek, novejÅ¡ih od arhiviranih" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "pri restavriranju piÅ¡i prek obstojeÄih datotek" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "" "s poprejÅ¡njim brisanjem obstojeÄih datotek pri restavriranju istoimenskih " "novih" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "izprazni hierarhije pred restavriranjem imenikov" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "ohrani metainformacije o obstojeÄih imenikih" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "pri restavriranju piÅ¡i prek metapodatkov obstojeÄih imenikov (privzeto)" -#: src/tar.c:490 -#, fuzzy +#: src/tar.c:504 msgid "preserve existing symlinks to directories when extracting" -msgstr "pri restavriranju piÅ¡i prek obstojeÄih datotek" +msgstr "pri restavriranju ohrani obstojeÄe simbolne povezave na imenike" + +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "IMENIK" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" -#: src/tar.c:496 +#: src/tar.c:513 msgid "Select output stream:" msgstr "Izbira izhodnega toka:" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "datoteke restavriraj na standardni izhod" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "UKAZ" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "datoteke napelji na vhod drugega programa" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "prezri izhodne kode hÄerinskih procesov" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "obravnavaj neniÄelne izhodne kode hÄerinskih procesov kot napako" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Ravnanje z atributi datotek:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "pri dodajanju datotek spremenimo lastnika v IME" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "pri dodajanju datotek spremenimo skupino v IME" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "DATUM-ÄŒAS" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "nastavi mtime za dodane datoteke iz DATUM-ALI-DATOTEKA" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "SPREMEMBE" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "zahtevaj (simbolne) SPREMEMBE zaÅ¡Äite za dodane datoteke" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "METODA" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " @@ -1688,11 +1703,11 @@ msgstr "" "branju (METODA=replace, privzeto) ali tako, da se Äasa sploh ne nastavi " "(METODA=system)" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "brez restavriranja Äasa spremembe" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" @@ -1700,23 +1715,23 @@ msgstr "" "skuÅ¡aj restavrirati datoteke tako, da se ohrani njihov lastnik iz arhiva " "(privzeto za administratorja)" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "" "restavriraj datoteke tako, da postanemo njihov lastnik (privzeto za navadne " "uporabnike)" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "s Å¡tevilÄnimi vrednostmi UID/GID namesto imen" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" "restavriraj podatke o dovoljenjih za dostop do datotek (privzeto za " "administratorja)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1724,16 +1739,17 @@ msgstr "" "uporabi uporabnikovo masko umask pri restavriranju dovoljenj za dostop do " "datotek (privzeto za uporabnike)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" +"argumenti elementov so navedeni v enakem vrstnem redu kot datoteke v arhivu" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "isto kot -p in -s skupaj" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1741,180 +1757,187 @@ msgstr "" "z nastavljanjem Äasa sprememb in dovoljenja za dostop za restavrirane " "imenike poÄakaj do zakljuÄka restavriranja" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "prekliÄi uÄinek izbire --delay-directory-restore" -#: src/tar.c:554 -#, fuzzy +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 msgid "Handling of extended file attributes:" -msgstr "Ravnanje z atributi datotek:" +msgstr "Ravnanje z razÅ¡irjenimi atributi datotek:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" -msgstr "" +msgstr "OmogoÄi podporo za razÅ¡irjene atribute" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" -msgstr "" +msgstr "OnemogoÄi podporo za razÅ¡irjene atribute" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" -msgstr "" +msgstr "MASKA" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" -msgstr "" +msgstr "doloÄi vkljuÄitveni vzorec za kljuÄe xattr" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" -msgstr "" +msgstr "doloÄi izkljuÄitveni vzorec za kljuÄe xattr" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" -msgstr "" +msgstr "OmogoÄi podporo za kontekst SELinux" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" -msgstr "" +msgstr "OnemogoÄi podporo za kontekst SELinux" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" -msgstr "" +msgstr "OmogoÄi podporo za POSIX ACL" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" -msgstr "" +msgstr "OnemogoÄi podporo za POSIX ACL" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "Izbira enote in preklapljanje:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ARHIV" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "uporabi datoteko ali enoto ARHIV" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "arhiv je lokalen kljub dvopiÄju v imenu datoteke" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "uporabi navedeni UKAZ rmt namesto rmt" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "uporabi nelokalen UKAZ namesto rsh" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "doloÄi enoto in gostoto zapisa" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "ustvari/preglej/restavriraj arhiv v veÄ delih" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "menjava traku po Å T x 1024 zapisanih bajtih" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "poženi SKRIPT po koncu traku (privzema -M)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" -msgstr "uporabimo/ažuriramo Å¡tevilo dela v DATOTEKI" +msgstr "uporabi/ažurira se Å¡tevilo dela v DATOTEKI" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "BloÄna razdelitev enote:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "BLOKI" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "dolžina zapisa BLOKI × 512 bajtov" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "Å TEVILO bajtov v zapisu (veÄkratnik 512)" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "ne meni se za bloke niÄel (EOF)" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "razdeli na bloke ob branju (cevovodi 4.2BSD)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "Izbira oblike arhiva:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "OBLIKA" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "ustvari arhiv v navedeni obliki" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "OBLIKA je nekaj od naÅ¡tetega:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "oblika starega V7 tar" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "stara oblika GNU tar <= 1.12" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "oblika GNU tar 1.13.x" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "oblika POSIX 1003.1-1988 (ustar)" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "oblika POSIX 1003.1-2001 (pax)" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "isto kot pax" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "isto kot --format=v7" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "isto kot --format=posix" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "kljuÄ[[:]=vrednost][,kljuÄ[[:]=vrednost]]..." -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "krmilni kljuÄi pax" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "VZOREC" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1922,171 +1945,182 @@ msgstr "" "ustvari arhiv z imenom dela IME; pri izpisu seznama/restavriranju je lahko " "IME regularni izraz za ime dela" -#: src/tar.c:660 +#: src/tar.c:684 msgid "Compression options:" msgstr "Izbire glede stiskanja:" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "program za stiskanje ugotovi iz pripone arhiva" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "ne ugotavljaj programa za stiskanje iz pripone arhiva" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "PROGRAM" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "filtriraj skozi PROGRAM (sprejemati mora izbiro -d)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "Izbira lokalne datoteke:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" "dodaj navedeno DATOTEKO v arhiv (za imena datotek, ki se zaÄnejo z »-«)" -#: src/tar.c:687 -msgid "DIR" -msgstr "IMENIK" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "pomik v navedeni IMENIK" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "preberi seznam datotek z navedene DATOTEKE" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "-T prebere z \\000 terminirana imena; onemogoÄi -C" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "prekliÄi uÄinek prejÅ¡nje izbire --null" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" msgstr "odstrani narekovaje iz imen datotek, prebranih s -T (privzeto)" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" msgstr "ne odstrani narekovajev iz imen datotek, prebranih s -T" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "VZOREC" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "brez datotek, ki jih opisuje VZOREC" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "brez datotek, ustrezajoÄim vzorcem, prebranih z DATOTEKE" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" "brez vsebine imenikov, ki vsebujejo znaÄko CACHEDIR.TAG, razen znaÄke same" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" "brez imenikov, ki vsebujejo znaÄko CACHEDIR.TAG, in vseh njihovih podimenikov" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "brez imenikov, ki vsebujejo znaÄko CACHEDIR.TAG" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "brez vsebine imenikov, ki vsebujejo DATOTEKO, razen DATOTEKE same" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "brez imenikov, ki vsebujejo DATOTEKO, in vseh njihovih podimenikov" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "brez imenikov, ki vsebujejo DATOTEKO" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "brez imenikov sistema za nadzor razliÄic" -#: src/tar.c:721 +#: src/tar.c:751 +#, fuzzy +msgid "read exclude patterns from the VCS ignore files" +msgstr "izkljuÄitveni vzorci ne vsebujejo metaznakov" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "brez varnostnih kopij in zaklepnih datotek" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" -msgstr "podimenikov ne vkljuÄujemo avtomatiÄno" +msgstr "podimenikov se ne vkljuÄuje samodejno" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "pri arhiviranju izpusti datoteke na nelokalnih datoteÄnih sistemih" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "rekurzivno vkljuÄi vse podimenike" -#: src/tar.c:729 -#, fuzzy +#: src/tar.c:761 msgid "don't strip leading '/'s from file names" msgstr "ne odstrani vodilnih »/« iz imen datotek" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "sledi simbolnim povezavam; arhiviraj/iznesi ciljne datoteke" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "sledi trdim povezavam; arhiviraj/iznesi ciljne datoteke" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "IME" -#: src/tar.c:735 -#, fuzzy +#: src/tar.c:767 msgid "begin at member MEMBER-NAME when reading the archive" -msgstr "zaÄenÅ¡i z navedenim IMENOM v arhivu" +msgstr "zaÄni z navedenim IMENOM ob branju arhiva" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "shrani le datoteke, novejÅ¡e od DATUM-ÄŒAS" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "DATUM" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "primerjaj datum in uro le, kadar se podatki spremenijo" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "TIP" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "" "varnostna kopija pred brisanjem, z možnostjo izbire TIPA varnostne kopije" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "NIZ" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -2094,101 +2128,98 @@ msgstr "" "varnostna kopija pred brisanjem; prekliÄemo obiÄajno PRIPONO (»~«, razen Äe " "lupinska spremenljivka SIMPLE_BACKUP_SUFFIX doloÄa drugaÄe)" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "Pretvorbe imen datotek:" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "pri restavriranju poreži Å TEVILO vodilnih komponent iz imen datotek" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "IZRAZ" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "uporabi nadomestitveni IZRAZ programa sed za pretvorbo imen datotek" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "Izbire ujemanja imen datotek (vpliva tako na vkljuÄitvene kot na " "izkljuÄitvene vzorce):" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "brez razlike med malimi in velikimi Ärkami" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "vzorci se ujemajo z zaÄetkom imena datoteke" -#: src/tar.c:767 -#, fuzzy +#: src/tar.c:799 msgid "patterns match after any '/' (default for exclusion)" msgstr "" "vzorci se ujemajo od kateregakoli znaka »/« dalje (privzeto pri izkljuÄitvi)" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "pri ujemanje se razlikuje med malimi in velikimi Ärkami (privzeto)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "uporabi nadomestne znake (privzeto za izkljuÄitvi)" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "dobesedno ujemanje nizov" -#: src/tar.c:775 -#, fuzzy +#: src/tar.c:807 msgid "wildcards do not match '/'" msgstr "nadomestni znaki se ne ujemajo z »/«" -#: src/tar.c:777 -#, fuzzy +#: src/tar.c:809 msgid "wildcards match '/' (default for exclusion)" msgstr "nadomestni znaki se ujemajo z »/« (privzeto pri izkljuÄitvi)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Informativni izpisi:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "z izÄrpnim izpisom obdelanih datotek" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "KLJUÄŒ" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "nadzor opozorila" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "izpiÅ¡i poroÄilo o napredku pri vsakem N-tem zapisu (privzeto 10)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "DEJANJE" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "na vsaki kontrolni toÄki izvedi DEJANJE" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "izpiÅ¡i sporoÄilo, Äe niso zapisane vse povezave" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "SIGNAL" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2200,35 +2231,35 @@ msgstr "" "SIGHUP, SIGQUIT, SIGINT, SIGUSR1 in SIGUSR2, prepoznana so tudi imena " "signalov brez predpone SIG-" -#: src/tar.c:802 +#: src/tar.c:834 msgid "print file modification times in UTC" msgstr "izpiÅ¡i Äase sprememb datotek v UTC" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "izpiÅ¡i Äas datoteke v polni loÄljivosti" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "zapiÅ¡i izÄrpno poroÄilo v DATOTEKO" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "z izpisom zaporednega bloka v arhivu ob vsakem sporoÄilu" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "vpraÅ¡aj za potrditev pri vsakem koraku" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "prikaži privzete nastavitve" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" -msgstr "" +msgstr "prikaži veljavne razpone za polja snapshot-file" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2236,31 +2267,31 @@ msgstr "" "pri izpisu seznama ali restavriranju izpiÅ¡i vsak imenik, ki ne ustreza " "iskalnim pogojem" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "prikaži imena datotek ali arhivov po pretvorbi" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "SLOG" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "nastavi slog navajanja imen; glej spodaj za veljavne SLOGE" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "dodatno navedi znake iz NIZA" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "onemogoÄi navajanje znakov iz NIZA" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "Združljivostne izbire:" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2268,55 +2299,54 @@ msgstr "" "ob ustvarjanju arhiva isto kot --old-archive; ob restavriranju isto kot --no-" "same-owner" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "Druge izbire:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "onemogoÄi rabo nekaterih potencialno Å¡kodljivih izbir" -#: src/tar.c:978 -#, fuzzy +#: src/tar.c:1010 msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" msgstr "Podate lahko najveÄ eno od izbir »-Acdtrux« ali »--test-label«" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "NasprotujoÄe si izbire glede stiskanja arhiva" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "Neznano ime signala: %s" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "Datoteke z vzorcem datuma ni najti" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" -msgstr "NadomeÅ¡Äamo %s za neznan format datuma %s" +msgstr "NadomeÅ¡Äa se %s za neznan format datuma %s" -#: src/tar.c:1108 -#, fuzzy, c-format +#: src/tar.c:1140 +#, c-format msgid "Option %s: Treating date '%s' as %s" -msgstr "Izbira %s: Datum »%s« obravnavamo kot %s" +msgstr "Izbira %s: Datum »%s« se obravnava kot %s" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "filtriraj arhiv skozi %s" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "Veljavni argumenti pri izbiri --quoting-style so:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2324,48 +2354,47 @@ msgstr "" "\n" "Privzete vrednosti *tega* programa tar:\n" -#: src/tar.c:1295 -#, fuzzy +#: src/tar.c:1330 msgid "Invalid owner or group ID" -msgstr "Neveljaven lastnik" +msgstr "Neveljaven ID lastnika ali skupine" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Neveljaven faktor blokiranja" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "Neveljavna dolžina traku" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "Okvarjena vrednost inkrementalne ravni" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "VeÄ kot en pražni podatek" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "Neveljavna vrednost razprÅ¡ene razliÄice" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "izbira --atime-preserve='system' na tem sistemu ni podprta" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "vrednost --checkpoint ni celo Å¡tevilo" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Podana zaÅ¡Äita ni veljavna" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "Neveljavno Å¡tevilo" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" @@ -2373,70 +2402,67 @@ msgstr "" "Raba izbire --preserve je odsvetovana, uporabite --preserve-permissions --" "preserve-order" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Neveljavna dolžina zapisa" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "Dolžina zapisa mora biti veÄkratnik %d." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "Neveljavno Å¡tevilo elementov" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "Dovoljena je le ena izbira --to-command" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "Okvarjen argument gostote: %s" -#: src/tar.c:2133 -#, fuzzy, c-format +#: src/tar.c:2205 +#, c-format msgid "Unknown density: '%c'" msgstr "Neznana gostota: »%c«" -#: src/tar.c:2150 -#, fuzzy, c-format +#: src/tar.c:2222 +#, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "*Ta* izvedba tar ne podpira izbir »-[0-7][lmh]«" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[DATOTEKA]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 #, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "izbire --%s ni mogoÄe uporabiti obenem z %s" + +#: src/tar.c:2389 +#, c-format msgid "Old option '%c' requires an argument." msgstr "Stara izbira »%c« zahteva argument." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence nima pomena brez seznama datotek" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "--occurrence ni mogoÄe uporabiti v zahtevanem naÄinu delovanja" - -#: src/tar.c:2408 -#, fuzzy +#: src/tar.c:2490 msgid "Multiple archive files require '-M' option" msgstr "VeÄ arhivskih datotek zahteva izbiro »-M«" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "Izbire --listed-incremental ni mogoÄe kombinirati z --newer" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "Izbira --level je brez pomena brez izbire --listed-incremential" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" @@ -2445,79 +2471,70 @@ msgstr[1] "%s: Oznaka dela je predolga (omejitev je %lu bajt)" msgstr[2] "%s: Oznaka dela je predolga (omejitev je %lu bajta)" msgstr[3] "%s: Oznaka dela je predolga (omejitev je %lu bajti)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Arhivov v veÄ delih ni mogoÄe preveriti" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Stisnjenega arhiva ni mogoÄe preveriti" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "Vzorca %s ni mogoÄe uporabiti" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Stisnjeni arhivi v veÄ delih niso mogoÄi" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "Stisnjenega arhiva ni mogoÄe združevati" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "izbira --pax-option je mogoÄa le na arhivih POSIX" -#: src/tar.c:2478 -#, fuzzy +#: src/tar.c:2560 msgid "--acls can be used only on POSIX archives" -msgstr "izbira --pax-option je mogoÄa le na arhivih POSIX" +msgstr "izbira --acls je mogoÄa le na arhivih POSIX" -#: src/tar.c:2483 -#, fuzzy +#: src/tar.c:2565 msgid "--selinux can be used only on POSIX archives" -msgstr "izbira --pax-option je mogoÄa le na arhivih POSIX" +msgstr "izbira --selinux je mogoÄa le na arhivih POSIX" -#: src/tar.c:2488 -#, fuzzy +#: src/tar.c:2570 msgid "--xattrs can be used only on POSIX archives" -msgstr "izbira --pax-option je mogoÄa le na arhivih POSIX" +msgstr "izbira --xattrs je mogoÄa le na arhivih POSIX" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "Vzorca %s ni mogoÄe uporabiti" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" +msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "Dolžina dela ne more biti manjÅ¡a od velikosti zapisa" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "Izbiri --preserve-order in --listed-incremential sta nezdružljivi" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "Zahteva po odprtju praznega arhiva bojazljivo zavrnjena" -#: src/tar.c:2565 -#, fuzzy +#: src/tar.c:2669 msgid "Options '-Aru' are incompatible with '-f -'" msgstr "Izbire »-Aru« so nezdružljive z »-f -«" -#: src/tar.c:2660 -#, fuzzy +#: src/tar.c:2766 msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" -msgstr "Ena od izbir »-Acdtrux« ali »--test-label« je obvezna" +msgstr "Ena od izbir »-Acdtrux«, »--delete« ali »--test-label« je obvezna" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "Zaradi predhodnih napak zakljuÄujemo s statusom napake" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" @@ -2527,99 +2544,99 @@ msgstr[1] "%s: Datoteka skrÄena za %s bajt" msgstr[2] "%s: Datoteka skrÄena za %s bajta" msgstr[3] "%s: Datoteka skrÄena za %s bajte" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "KljuÄ %s je bodisi neznan, bodisi Å¡e ni izveden" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" msgstr "Oznaka Äasa izven obsega" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "Vzorca %s ni mogoÄe uporabiti" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "KljuÄa %s ni mogoÄe preklicati" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "PoÅ¡kodovana razÅ¡irjena glava: manjka dolžina" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "Dolžina razÅ¡irjene glave %*s je izven dovoljenega obsega" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "PoÅ¡kodovana razÅ¡irjena glava: za dolžino manjka presledek" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "PoÅ¡kodovana razÅ¡irjena glava: manjka enaÄaj" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "PoÅ¡kodovana razÅ¡irjena glava: manjka znak za novo vrstico" -#: src/xheader.c:740 -#, fuzzy, c-format +#: src/xheader.c:741 +#, c-format msgid "Ignoring unknown extended header keyword '%s'" -msgstr "Ne upoÅ¡tevamo neznanega kljuÄa razÅ¡irjene glave »%s«" +msgstr "Ne upoÅ¡teva se neznanega kljuÄa razÅ¡irjene glave »%s«" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "Ustvarjeni par kljuÄ/vrednost je predolg (kljuÄ=%s, dolžina=%s)" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "Par %s=%s v razÅ¡irjeni glavi je izven obsega %s..%s" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "PoÅ¡kodovana razÅ¡irjena glava: neveljavni %s=%s" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "PoÅ¡kodovana razÅ¡irjena glava: odveÄni %s=%s" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" "PoÅ¡kodovana razÅ¡irjena glava: neveljavni %s: nepriÄakovani razmejilnik %c" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "PoÅ¡kodovana razÅ¡irjena glava: neveljavni %s: liho Å¡tevilo vrednosti" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "%s: neveljaven Äas preteka" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "%s: neznano dejanje za kontrolno toÄko" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "zapiÅ¡i" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "preberi" @@ -2628,7 +2645,7 @@ msgstr "preberi" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "Oznaka pisanja %u" @@ -2638,7 +2655,7 @@ msgstr "Oznaka pisanja %u" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "Oznaka branja %u" @@ -2850,14 +2867,14 @@ msgid "cannot set time on `%s'" msgstr "ni mogoÄe nastaviti Äasa za »%s«" #: tests/genfile.c:692 -#, fuzzy, c-format +#, c-format msgid "cannot truncate `%s'" -msgstr "ni mogoÄe odstraniti »%s«" +msgstr "ni mogoÄe okrajÅ¡ati »%s«" #: tests/genfile.c:701 -#, fuzzy, c-format +#, c-format msgid "command failed: %s" -msgstr "ukaz %s neuspeÅ¡en" +msgstr "ukaz neuspeÅ¡en: %s" #: tests/genfile.c:706 #, c-format @@ -2900,11 +2917,17 @@ msgstr "Ukaz je bil prekinjen\n" msgid "--stat requires file names" msgstr "--stat zahteva imena datotek" -#~ msgid "Cannot get working directory" -#~ msgstr "Delovnega imenika ni mogoÄe ugotoviti" +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "--occurrence ni mogoÄe uporabiti skupaj z %s" -#~ msgid "sort names to extract to match archive" -#~ msgstr "imena razvrstimo tako, da se ujemajo z arhivom" +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "Izbire --listed-incremental ni mogoÄe kombinirati z --newer" + +#~ msgid "--verify cannot be used with %s" +#~ msgstr "Izbire --verify ni mogoÄe uporabiti skupaj z %s" + +#~ msgid "--preserve-order is not compatible with --listed-incremental" +#~ msgstr "Izbiri --preserve-order in --listed-incremential sta nezdružljivi" #~ msgid "Field too long while reading snapshot file" #~ msgstr "Predolgo polje pri branju trenutnega posnetka" @@ -2915,12 +2938,18 @@ msgstr "--stat zahteva imena datotek" #~ msgid "Unexpected field value in snapshot file" #~ msgstr "NepriÄakovana vrednost polja v trenutnem posnetku" -#~ msgid "Extended header length is out of allowed range" -#~ msgstr "Dolžina razÅ¡irjene glave je izven dovoljenega obsega" +#~ msgid "Cannot get working directory" +#~ msgstr "Delovnega imenika ni mogoÄe ugotoviti" + +#~ msgid "sort names to extract to match archive" +#~ msgstr "imena razvrstimo tako, da se ujemajo z arhivom" #~ msgid "Invalid group" #~ msgstr "Neveljavna skupina" +#~ msgid "Extended header length is out of allowed range" +#~ msgstr "Dolžina razÅ¡irjene glave je izven dovoljenega obsega" + #~ msgid "%s: Directory removed before we read it" #~ msgstr "%s: Imenik je bil odstranjen, preden smo ga prebrali" @@ -3046,9 +3075,6 @@ msgstr "--stat zahteva imena datotek" #~ msgid "Missing file name after -C" #~ msgstr "Za izbiro -C manjka ime datoteke" -#~ msgid "exclude patterns are plain strings" -#~ msgstr "izkljuÄitveni vzorci ne vsebujejo metaznakov" - #~ msgid "same as -N" #~ msgstr "isto kot -N" diff --git a/po/sr.gmo b/po/sr.gmo new file mode 100644 index 0000000..aa15165 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 0000000..6c96696 --- /dev/null +++ b/po/sr.po @@ -0,0 +1,2901 @@ +# Serbian translation of tar. +# Copyright (C) 2014 Free Software Foundation, Inc. +# This file is distributed under the same license as the tar package. +# МироÑлав Ðиколић , 2014. +# +#: src/create.c:1574 +msgid "" +msgstr "" +"Project-Id-Version: tar-1.27\n" +"Report-Msgid-Bugs-To: bug-tar@gnu.org\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" +"PO-Revision-Date: 2014-03-14 05:15+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" + +#: gnu/argmatch.c:135 +#, c-format +msgid "invalid argument %s for %s" +msgstr "неиÑправан аргумент „%s“ за „%s“" + +#: gnu/argmatch.c:136 +#, c-format +msgid "ambiguous argument %s for %s" +msgstr "нејаÑан аргумент „%s“ за „%s“" + +#: gnu/argmatch.c:155 +msgid "Valid arguments are:" +msgstr "ИÑправни аргументи Ñу:" + +#: gnu/argp-help.c:150 +#, c-format +msgid "ARGP_HELP_FMT: %s value is less than or equal to %s" +msgstr "ARGP_HELP_FMT: „%s“ вредноÑÑ‚ је мања од или једнака Ñа „%s“" + +#: gnu/argp-help.c:223 +#, c-format +msgid "%.*s: ARGP_HELP_FMT parameter requires a value" +msgstr "%.*s: „ARGP_HELP_FMT“ параметар захтева вредноÑÑ‚" + +#: gnu/argp-help.c:229 +#, c-format +msgid "%.*s: ARGP_HELP_FMT parameter must be positive" +msgstr "%.*s: „ARGP_HELP_FMT“ параметар мора бити позитиван" + +#: gnu/argp-help.c:238 +#, c-format +msgid "%.*s: Unknown ARGP_HELP_FMT parameter" +msgstr "%.*s: Ðепознат „ARGP_HELP_FMT“ параметар" + +#: gnu/argp-help.c:250 +#, c-format +msgid "Garbage in ARGP_HELP_FMT: %s" +msgstr "Ђубре у „ARGP_HELP_FMT“-у: %s" + +#: gnu/argp-help.c:1250 +msgid "" +"Mandatory or optional arguments to long options are also mandatory or " +"optional for any corresponding short options." +msgstr "" +"Обавезни или изборни аргументи за дуге опције Ñу такође обавезни или изборни " +"за било које одговарајуће кратке опције." + +#: gnu/argp-help.c:1643 +msgid "Usage:" +msgstr "Употреба:" + +#: gnu/argp-help.c:1647 +msgid " or: " +msgstr " или: " + +#: gnu/argp-help.c:1659 +msgid " [OPTION...]" +msgstr " [ОПЦИЈÐ...]" + +#: gnu/argp-help.c:1686 +#, c-format +msgid "Try '%s --help' or '%s --usage' for more information.\n" +msgstr "Покушајте „%s --help“ или „%s --usage“ за више података.\n" + +#: gnu/argp-help.c:1714 +#, c-format +msgid "Report bugs to %s.\n" +msgstr "Грешке пријавите на %s\n" + +#: gnu/argp-help.c:1933 gnu/error.c:190 +msgid "Unknown system error" +msgstr "Ðепозната грешка ÑиÑтема" + +#: gnu/argp-parse.c:83 +msgid "give this help list" +msgstr "приказује овај ÑпиÑак помоћи" + +#: gnu/argp-parse.c:84 +msgid "give a short usage message" +msgstr "приказује кратку поруку коришћења" + +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 +#: tests/genfile.c:130 +msgid "NAME" +msgstr "ÐÐЗИВ" + +#: gnu/argp-parse.c:85 +msgid "set the program name" +msgstr "поÑтавља назив програма" + +#: gnu/argp-parse.c:86 +msgid "SECS" +msgstr "СЕКУÐДИ" + +#: gnu/argp-parse.c:87 +msgid "hang for SECS seconds (default 3600)" +msgstr "Ñтаје за СЕКУÐДЕ Ñекунде (оÑновно је 3600)" + +#: gnu/argp-parse.c:144 +msgid "print program version" +msgstr "иÑпиÑује издање програма" + +#: gnu/argp-parse.c:161 +msgid "(PROGRAM ERROR) No version known!?" +msgstr "(ГРЕШКРПРОГРÐÐœÐ) Ðије познато издање!?" + +#: gnu/argp-parse.c:614 +#, c-format +msgid "%s: Too many arguments\n" +msgstr "%s: Превише аргумената\n" + +#: gnu/argp-parse.c:757 +msgid "(PROGRAM ERROR) Option should have been recognized!?" +msgstr "(ГРЕШКРПРОГРÐÐœÐ) Опција треба да буде препозната!?" + +#: gnu/closeout.c:114 +msgid "write error" +msgstr "грешка пиÑања" + +#: gnu/getopt.c:549 gnu/getopt.c:578 +#, c-format +msgid "%s: option '%s' is ambiguous; possibilities:" +msgstr "%s: опција „%s“ је нејаÑна; могућноÑти:" + +#: gnu/getopt.c:626 gnu/getopt.c:630 +#, c-format +msgid "%s: option '--%s' doesn't allow an argument\n" +msgstr "%s: опција „--%s“ не дозвољава аргумент\n" + +#: gnu/getopt.c:639 gnu/getopt.c:644 +#, c-format +msgid "%s: option '%c%s' doesn't allow an argument\n" +msgstr "%s: опција „%c%s“ не дозвољава аргумент\n" + +#: gnu/getopt.c:687 gnu/getopt.c:706 +#, c-format +msgid "%s: option '--%s' requires an argument\n" +msgstr "%s: опција „--%s“ захтева аргумент\n" + +#: gnu/getopt.c:744 gnu/getopt.c:747 +#, c-format +msgid "%s: unrecognized option '--%s'\n" +msgstr "%s: непозната опција „--%s“\n" + +#: gnu/getopt.c:755 gnu/getopt.c:758 +#, c-format +msgid "%s: unrecognized option '%c%s'\n" +msgstr "%s: непозната опција „%c%s“\n" + +#: gnu/getopt.c:807 gnu/getopt.c:810 +#, c-format +msgid "%s: invalid option -- '%c'\n" +msgstr "%s: неиÑправна опција -- „%c“\n" + +#: gnu/getopt.c:863 gnu/getopt.c:880 gnu/getopt.c:1090 gnu/getopt.c:1108 +#, c-format +msgid "%s: option requires an argument -- '%c'\n" +msgstr "%s: опција захтева аргумент -- „%c“\n" + +#: gnu/getopt.c:936 gnu/getopt.c:952 +#, c-format +msgid "%s: option '-W %s' is ambiguous\n" +msgstr "%s: опција „-W %s“ је нејаÑна\n" + +#: gnu/getopt.c:976 gnu/getopt.c:994 +#, c-format +msgid "%s: option '-W %s' doesn't allow an argument\n" +msgstr "%s: опција „-W %s“ не дозвољава аргумент\n" + +#: gnu/getopt.c:1015 gnu/getopt.c:1033 +#, c-format +msgid "%s: option '-W %s' requires an argument\n" +msgstr "%s: опција „-W %s“ захтева аргумент\n" + +#: gnu/obstack.c:415 gnu/obstack.c:417 gnu/xalloc-die.c:36 +msgid "memory exhausted" +msgstr "меморија је потрошена" + +#: gnu/openat-die.c:40 +#, c-format +msgid "unable to record current working directory" +msgstr "не могу да Ñнимим тренутни радни директоријум" + +#: gnu/openat-die.c:59 +#, 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. +#: gnu/quotearg.c:314 +msgid "`" +msgstr "„" + +#: gnu/quotearg.c:315 +msgid "'" +msgstr "“" + +#. 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=' +#: gnu/rpmatch.c:152 +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=' +#: gnu/rpmatch.c:165 +msgid "^[nN]" +msgstr "^[nN]" + +#: gnu/version-etc.c:76 +#, c-format +msgid "Packaged by %s (%s)\n" +msgstr "Запаковао је %s (%s)\n" + +#: gnu/version-etc.c:79 +#, 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. +#: gnu/version-etc.c:86 +msgid "(C)" +msgstr "©" + +#: gnu/version-etc.c:88 +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. +#: gnu/version-etc.c:104 +#, c-format +msgid "Written by %s.\n" +msgstr "ÐапиÑао је %s.\n" + +#. TRANSLATORS: Each %s denotes an author name. +#: gnu/version-etc.c:108 +#, c-format +msgid "Written by %s and %s.\n" +msgstr "ÐапиÑали Ñу %s и %s.\n" + +#. TRANSLATORS: Each %s denotes an author name. +#: gnu/version-etc.c:112 +#, 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. +#: gnu/version-etc.c:119 +#, 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. +#: gnu/version-etc.c:126 +#, 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. +#: gnu/version-etc.c:133 +#, 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. +#: gnu/version-etc.c:141 +#, 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. +#: gnu/version-etc.c:149 +#, 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. +#: gnu/version-etc.c:158 +#, 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. +#: gnu/version-etc.c:169 +#, 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). +#: gnu/version-etc.c:247 +#, c-format +msgid "" +"\n" +"Report bugs to: %s\n" +msgstr "" +"\n" +"Грешке пријавите на: %s\n" + +#: gnu/version-etc.c:249 +#, c-format +msgid "Report %s bugs to: %s\n" +msgstr "Грешке програма „%s“ пријавите на: %s\n" + +#: gnu/version-etc.c:253 +#, c-format +msgid "%s home page: <%s>\n" +msgstr "Матична Ñтраница „%s“: <%s>.\n" + +#: gnu/version-etc.c:255 +#, c-format +msgid "%s home page: \n" +msgstr "„%s“ матична Ñтраница: \n" + +#: gnu/version-etc.c:258 +msgid "General help using GNU software: \n" +msgstr "Општа помоћ кориÑтећи Гнуов Ñофтвер: \n" + +#. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'. +#. Directly translating this to another language will not work, first because +#. %s itself is not translated. +#. Translate it as `%s: Function %s failed'. +#: lib/paxerror.c:60 lib/paxerror.c:73 +#, c-format +msgid "%s: Cannot %s" +msgstr "%s: Функција „%s“ није уÑпела" + +#. TRANSLATORS: %s after `Cannot' is a function name, e.g. `Cannot open'. +#. Directly translating this to another language will not work, first because +#. %s itself is not translated. +#. Translate it as `%s: Function %s failed'. +#: lib/paxerror.c:86 +#, c-format +msgid "%s: Warning: Cannot %s" +msgstr "%s: Упозорење: Функција „%s“ није уÑпела" + +#: lib/paxerror.c:95 +#, c-format +msgid "%s: Cannot change mode to %s" +msgstr "%s: Ðе могу да променим режим у „%s“" + +#: lib/paxerror.c:103 +#, c-format +msgid "%s: Cannot change ownership to uid %lu, gid %lu" +msgstr "%s: Ðе могу да променим влаÑништво на уибу %lu, гиб %lu" + +#: lib/paxerror.c:129 +#, c-format +msgid "%s: Cannot hard link to %s" +msgstr "%s: Ðе могу да Ñтворим чврÑту везу до „%s“" + +#: lib/paxerror.c:181 lib/paxerror.c:213 +#, c-format +msgid "%s: Read error at byte %s, while reading %lu byte" +msgid_plural "%s: Read error at byte %s, while reading %lu bytes" +msgstr[0] "%s: Грешка читања на бајту %s, за време читања %lu бајта" +msgstr[1] "%s: Грешка читања на бајту %s, за време читања %lu бајта" +msgstr[2] "%s: Грешка читања на бајту %s, за време читања %lu бајтова" + +#: lib/paxerror.c:194 +#, c-format +msgid "%s: Warning: Read error at byte %s, while reading %lu byte" +msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" +msgstr[0] "%s: Упозорење: Грешка читања на бајту %s, за време читања %lu бајта" +msgstr[1] "%s: Упозорење: Грешка читања на бајту %s, за време читања %lu бајта" +msgstr[2] "" +"%s: Упозорење: Грешка читања на бајту %s, за време читања %lu бајтова" + +#: lib/paxerror.c:261 +#, c-format +msgid "%s: Cannot seek to %s" +msgstr "%s: Ðе могу да Ñкочим на „%s“" + +#: lib/paxerror.c:277 +#, c-format +msgid "%s: Warning: Cannot seek to %s" +msgstr "%s: Упозорење: Ðе могу да Ñкочим на „%s“" + +#: lib/paxerror.c:286 +#, c-format +msgid "%s: Cannot create symlink to %s" +msgstr "%s: Ðе могу да Ñтворим Ñимболичку везу до „%s“" + +#: lib/paxerror.c:351 +#, c-format +msgid "%s: Wrote only %lu of %lu byte" +msgid_plural "%s: Wrote only %lu of %lu bytes" +msgstr[0] "%s: ЗапиÑах Ñамо %lu од %lu бајта" +msgstr[1] "%s: ЗапиÑах Ñамо %lu од %lu бајта" +msgstr[2] "%s: ЗапиÑах Ñамо %lu од %lu бајтова" + +#: lib/paxnames.c:140 +#, c-format +msgid "Removing leading `%s' from member names" +msgstr "Уклањам водеће „%s“ из назива чланова" + +#: lib/paxnames.c:141 +#, c-format +msgid "Removing leading `%s' from hard link targets" +msgstr "Уклањам водеће „%s“ из мета чврÑтих веза" + +#: lib/paxnames.c:154 +msgid "Substituting `.' for empty member name" +msgstr "Замењујем „.“ за празан назив члана" + +#: lib/paxnames.c:155 +msgid "Substituting `.' for empty hard link target" +msgstr "Замењујем „.“ за празну мету чврÑте везе" + +#: lib/rtapelib.c:299 +#, c-format +msgid "exec/tcp: Service not available" +msgstr "екÑец/тцп: УÑлуга није доÑтупна" + +#: lib/rtapelib.c:303 +#, c-format +msgid "stdin" +msgstr "Ñтандардни улаз" + +#: lib/rtapelib.c:306 +#, c-format +msgid "stdout" +msgstr "Ñтандардни излаз" + +#: lib/rtapelib.c:429 +#, c-format +msgid "Cannot connect to %s: resolve failed" +msgstr "Ðе могу да Ñе повежем Ñа „%s“: решавање није уÑпело" + +#: lib/rtapelib.c:502 +#, c-format +msgid "Cannot redirect files for remote shell" +msgstr "Ðе могу да преуÑмерим датотеке за удаљену шкољку" + +#: lib/rtapelib.c:516 +#, c-format +msgid "Cannot execute remote shell" +msgstr "Ðе могу да извршим удаљену шкољку" + +#: rmt/rmt.c:432 +msgid "Seek direction out of range" +msgstr "Смер премотавања је изван опÑега" + +#: rmt/rmt.c:438 +msgid "Invalid seek direction" +msgstr "ÐеиÑправан Ñмер премотавања" + +#: rmt/rmt.c:446 +msgid "Invalid seek offset" +msgstr "ÐеиÑправан померај премотавања" + +#: rmt/rmt.c:452 +msgid "Seek offset out of range" +msgstr "Померај премотавања је изван опÑега" + +#: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608 +msgid "Invalid byte count" +msgstr "ÐеиÑправан број бајта" + +#: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625 +msgid "Byte count out of range" +msgstr "Број бајта је изван опÑега" + +#: rmt/rmt.c:558 +msgid "Premature eof" +msgstr "Прерани крај датотеке" + +#: rmt/rmt.c:601 +msgid "Invalid operation code" +msgstr "ÐеиÑправна шифра радње" + +#: rmt/rmt.c:636 rmt/rmt.c:680 +msgid "Operation not supported" +msgstr "Радња није подржана" + +#: rmt/rmt.c:664 +msgid "Unexpected arguments" +msgstr "Ðеочекивани аргументи" + +#: rmt/rmt.c:689 +msgid "Manipulate a tape drive, accepting commands from a remote process" +msgstr "Управља уређајем траке, прихватајући наредбе од удаљеног процеÑа" + +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 +msgid "NUMBER" +msgstr "БРОЈ" + +#: rmt/rmt.c:697 +msgid "set debug level" +msgstr "поÑтавља ниво прочишћавања" + +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 +msgid "FILE" +msgstr "ДÐТОТЕКÐ" + +#: rmt/rmt.c:699 +msgid "set debug output file name" +msgstr "поÑтавља назив излазне датотеке прочишћавања" + +#: rmt/rmt.c:715 rmt/rmt.c:783 +#, c-format +msgid "cannot open %s" +msgstr "не могу да отворим „%s“" + +#: rmt/rmt.c:780 tests/genfile.c:892 tests/genfile.c:909 +#, c-format +msgid "too many arguments" +msgstr "превише аргумената" + +#: rmt/rmt.c:822 +msgid "Garbage command" +msgstr "Ðаредба за ђубре" + +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 +#: src/update.c:188 +msgid "This does not look like a tar archive" +msgstr "Ово не изгледа као тар архива" + +#: src/buffer.c:574 +msgid "Total bytes read" +msgstr "Укупно прочитаних бајтова" + +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "Укупно упиÑаних бајтова" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" +msgstr "Укупно обриÑаних бајтова: %s\n" + +#: src/buffer.c:656 +msgid "(pipe)" +msgstr "(Ñпојка)" + +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 +msgid "Invalid value for record_size" +msgstr "ÐеиÑправна вредноÑÑ‚ за величину_Ñнимка" + +#: src/buffer.c:698 +msgid "No archive name given" +msgstr "Ðије дат назив архиве" + +#: src/buffer.c:741 +msgid "Cannot verify stdin/stdout archive" +msgstr "Ðе могу да проверим архиву Ñтандарног улаза/излаза" + +#: src/buffer.c:754 +#, c-format +msgid "Archive is compressed. Use %s option" +msgstr "Ðрхива је запакована. КориÑтите опцију „%s“" + +#: src/buffer.c:812 src/tar.c:2541 +msgid "Cannot update compressed archives" +msgstr "Ðе могу да оÑвежим запаковане архиве" + +#: src/buffer.c:905 +msgid "At beginning of tape, quitting now" +msgstr "Ðа почетку Ñам траке, прекидам" + +#: src/buffer.c:911 +msgid "Too many errors, quitting" +msgstr "Превише грешака, прекидам" + +#: src/buffer.c:944 +#, c-format +msgid "Record size = %lu block" +msgid_plural "Record size = %lu blocks" +msgstr[0] "Величина Ñнимања = %lu блок" +msgstr[1] "Величина Ñнимања = %lu блока" +msgstr[2] "Величина Ñнимања = %lu блокова" + +#: src/buffer.c:965 +#, c-format +msgid "Unaligned block (%lu byte) in archive" +msgid_plural "Unaligned block (%lu bytes) in archive" +msgstr[0] "Ðепоравнат блок (%lu бајт) у архиви" +msgstr[1] "Ðепоравнат блок (%lu бајта) у архиви" +msgstr[2] "Ðепоравнат блок (%lu бајтова) у архиви" + +#: src/buffer.c:1042 +msgid "Cannot backspace archive file; it may be unreadable without -i" +msgstr "Ðе могу да померим уназад датотеку архиве; може бити нечитка без „-i“" + +#: src/buffer.c:1074 +msgid "rmtlseek not stopped at a record boundary" +msgstr "„rmtlseek“ није зауÑтављен на граници Ñнимања" + +#: src/buffer.c:1125 +#, c-format +msgid "%s: contains invalid volume number" +msgstr "%s: Ñадржи погрешан број диÑка" + +#: src/buffer.c:1160 +msgid "Volume number overflow" +msgstr "Прекорачење броја диÑка" + +#: src/buffer.c:1175 +#, c-format +msgid "Prepare volume #%d for %s and hit return: " +msgstr "Припремите диÑк #%d за „%s“ и притиÑните врати: " + +#: src/buffer.c:1181 +msgid "EOF where user reply was expected" +msgstr "крај датотеке где Ñе очекивао одговор кориÑника" + +#: src/buffer.c:1186 src/buffer.c:1218 +msgid "WARNING: Archive is incomplete" +msgstr "УПОЗОРЕЊЕ: Ðрхива није потпуна" + +#: src/buffer.c:1200 +#, c-format +msgid "" +" n name Give a new file name for the next (and subsequent) volume(s)\n" +" q Abort tar\n" +" y or newline Continue operation\n" +msgstr "" +" n назив Даје нови назив датотеке за Ñледећи (и наредни) диÑк(ове)\n" +" q Прекида тар\n" +" y или newline ÐаÑтавља радњу\n" + +# проверити и питати +#: src/buffer.c:1205 +#, c-format +msgid " ! Spawn a subshell\n" +msgstr " ! Израђа подшкољку\n" + +#: src/buffer.c:1206 +#, c-format +msgid " ? Print this list\n" +msgstr " ? ИÑпÑиује овај ÑпиÑак\n" + +#: src/buffer.c:1213 +msgid "No new volume; exiting.\n" +msgstr "Ðема новог диÑка; излазим.\n" + +#: src/buffer.c:1246 +msgid "File name not specified. Try again.\n" +msgstr "ÐиÑте навели назив датотеке. Покушајте поново.\n" + +#: src/buffer.c:1259 +#, c-format +msgid "Invalid input. Type ? for help.\n" +msgstr "ÐеиÑправан улаз. Укуцајте ? за помоћ.\n" + +#: src/buffer.c:1310 +#, c-format +msgid "%s command failed" +msgstr "Ðије уÑпела наредба „%s“" + +#: src/buffer.c:1491 +#, c-format +msgid "%s is possibly continued on this volume: header contains truncated name" +msgstr "" +"„%s“ је вероватно наÑтавио на овом диÑку: заглавље Ñадржи Ñкраћени назив" + +#: src/buffer.c:1495 +#, c-format +msgid "%s is not continued on this volume" +msgstr "„%s“ није наÑтавио на овом диÑку" + +#: src/buffer.c:1509 +#, c-format +msgid "%s is the wrong size (%s != %s + %s)" +msgstr "%s је погрешне величине (%s != %s + %s)" + +#: src/buffer.c:1524 +#, c-format +msgid "This volume is out of sequence (%s - %s != %s)" +msgstr "Овај диÑк је ван низа (%s - %s != %s)" + +#: src/buffer.c:1602 src/buffer.c:1628 +#, c-format +msgid "Archive not labeled to match %s" +msgstr "Ðрхива није обележена да поклопи „%s“" + +#: src/buffer.c:1632 +#, c-format +msgid "Volume %s does not match %s" +msgstr "ДиÑк „%s“ не поклапа „%s“" + +#: src/buffer.c:1726 +#, c-format +msgid "" +"%s: file name too long to be stored in a GNU multivolume header, truncated" +msgstr "" +"%s: назив датотеке је предуг да би Ñе Ñачувао у заглављу Гнуовог вишедика, " +"Ñкраћено" + +#: src/buffer.c:1917 +msgid "write did not end on a block boundary" +msgstr "пиÑање није завршило на граници блока" + +#: src/compare.c:96 +#, c-format +msgid "Could only read %lu of %lu byte" +msgid_plural "Could only read %lu of %lu bytes" +msgstr[0] "Могу да прочитам Ñамо %lu од %lu бајта" +msgstr[1] "Могу да прочитам Ñамо %lu од %lu бајта" +msgstr[2] "Могу да прочитам Ñамо %lu од %lu бајтова" + +#: src/compare.c:106 src/compare.c:391 +msgid "Contents differ" +msgstr "Садржаји Ñе разликују" + +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 +msgid "Unexpected EOF in archive" +msgstr "Ðеочекиван крај датотеке у архиви" + +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 +msgid "File type differs" +msgstr "Ð’Ñ€Ñта датотеке Ñе разликује" + +#: src/compare.c:183 src/compare.c:203 src/compare.c:324 +msgid "Mode differs" +msgstr "Режим Ñе разликује" + +#: src/compare.c:206 +msgid "Uid differs" +msgstr "Јиб Ñе разликује" + +#: src/compare.c:208 +msgid "Gid differs" +msgstr "Гиб Ñе разликује" + +#: src/compare.c:212 +msgid "Mod time differs" +msgstr "Време калупа Ñе разликује" + +#: src/compare.c:216 src/compare.c:425 +msgid "Size differs" +msgstr "Величина Ñе разликује" + +#: src/compare.c:265 +#, c-format +msgid "Not linked to %s" +msgstr "Ðије повезан Ñа „%s“" + +#: src/compare.c:289 +msgid "Symlink differs" +msgstr "Симболичка веза Ñе разликује" + +#: src/compare.c:318 +msgid "Device number differs" +msgstr "Број уређаја Ñе разликује" + +#: src/compare.c:466 +#, c-format +msgid "Verify " +msgstr "Провери " + +#: src/compare.c:473 +#, c-format +msgid "%s: Unknown file type '%c', diffed as normal file" +msgstr "%s: Ðепозната врÑта датотеке „%c“, другачија је од обичне датотеке" + +#: src/compare.c:529 +msgid "Archive contains file names with leading prefixes removed." +msgstr "Ðрхива Ñадржи називе датотека Ñа уклоњеним водећим префикÑима." + +#: src/compare.c:535 +msgid "Archive contains transformed file names." +msgstr "Ðрхива Ñадржи преиначене називе датотека." + +#: src/compare.c:540 +msgid "Verification may fail to locate original files." +msgstr "Провера можда не уÑпе да пронађе изворне датотеке." + +#: src/compare.c:614 +#, c-format +msgid "VERIFY FAILURE: %d invalid header detected" +msgid_plural "VERIFY FAILURE: %d invalid headers detected" +msgstr[0] "ÐЕУСПЕЛРПРОВЕРÐ: откривено је %d неиÑправно заглавље" +msgstr[1] "ÐЕУСПЕЛРПРОВЕРÐ: откривена Ñу %d неиÑправна заглавља" +msgstr[2] "ÐЕУСПЕЛРПРОВЕРÐ: откривено је %d неиÑправних заглавља" + +#: src/compare.c:632 src/list.c:250 +#, c-format +msgid "A lone zero block at %s" +msgstr "УÑамљени нулти блок на „%s“" + +#: src/create.c:73 +#, c-format +msgid "%s: contains a cache directory tag %s; %s" +msgstr "%s: Ñадржи ознаку директоријума оÑтаве „%s“; %s" + +#: src/create.c:262 +#, c-format +msgid "value %s out of %s range %s..%s; substituting %s" +msgstr "вредноÑÑ‚ „%s“ је ван „%s“ опÑега %s..%s; замењујем Ñа „%s“" + +#: src/create.c:268 +#, c-format +msgid "value %s out of %s range %s..%s" +msgstr "вредноÑÑ‚ „%s“ је ван „%s“ опÑега %s..%s" + +#: src/create.c:328 +msgid "Generating negative octal headers" +msgstr "Стварам негативна октална заглавља" + +#: src/create.c:601 src/create.c:664 +#, c-format +msgid "%s: file name is too long (max %d); not dumped" +msgstr "%s: назив датотеке је предуг (највише %d); није изнет" + +#: src/create.c:611 +#, c-format +msgid "%s: file name is too long (cannot be split); not dumped" +msgstr "%s: назив датотеке је предуг (не могу да га поделим); није изнет" + +#: src/create.c:638 +#, c-format +msgid "%s: link name is too long; not dumped" +msgstr "%s: назив везе је предуг; није изнет" + +#: src/create.c:1084 +#, c-format +msgid "%s: File shrank by %s byte; padding with zeros" +msgid_plural "%s: File shrank by %s bytes; padding with zeros" +msgstr[0] "%s: Датотека је Ñмањена за %s бајт, допуњена нулама" +msgstr[1] "%s: Датотека је Ñмањена за %s бајта, допуњена нулама" +msgstr[2] "%s: Датотека је Ñмањена за %s бајтова, допуњена нулама" + +#: src/create.c:1182 +#, c-format +msgid "%s: file is on a different filesystem; not dumped" +msgstr "%s: датотека је на другачијем ÑиÑтему датотека; није изнета" + +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 +msgid "contents not dumped" +msgstr "Ñадржај није изнет" + +#: src/create.c:1440 +#, c-format +msgid "%s: Unknown file type; file ignored" +msgstr "%s: Ðепозната врÑта датотеке; датотека је занемарена" + +#: src/create.c:1551 +#, c-format +msgid "Missing links to %s." +msgstr "ÐедоÑтаје веза на „%s“." + +#: src/create.c:1712 +#, c-format +msgid "%s: file is unchanged; not dumped" +msgstr "%s: датотека је непромењена; није изнета" + +#: src/create.c:1721 +#, c-format +msgid "%s: file is the archive; not dumped" +msgstr "%s: датотека је архива; није изнета" + +#: src/create.c:1749 src/incremen.c:603 +msgid "directory not dumped" +msgstr "директоријум није изнет" + +#: src/create.c:1821 +#, c-format +msgid "%s: file changed as we read it" +msgstr "%s: датотека је промењена у току читања" + +#: src/create.c:1902 +#, c-format +msgid "%s: socket ignored" +msgstr "%s: прикључница је занемарена" + +#: src/create.c:1908 +#, c-format +msgid "%s: door ignored" +msgstr "%s: врата Ñу занемарена" + +#: src/delete.c:218 src/list.c:287 src/update.c:193 +msgid "Skipping to next header" +msgstr "Прелазим на Ñледеће заглавље" + +#: src/delete.c:284 +msgid "Deleting non-header from archive" +msgstr "Бришем не-заглавља из архиве" + +#: src/extract.c:302 +#, c-format +msgid "%s: implausibly old time stamp %s" +msgstr "%s: неприхватљива Ñтара временÑка ознака „%s“" + +#: src/extract.c:320 +#, c-format +msgid "%s: time stamp %s is %s s in the future" +msgstr "%s: временÑка ознака „%s“ је %s Ñек. у будућноÑти" + +#: src/extract.c:536 +#, c-format +msgid "%s: Unexpected inconsistency when making directory" +msgstr "%s: Ðеочекивана недоÑледноÑÑ‚ приликом прављења директоријума" + +#: src/extract.c:705 +#, c-format +msgid "%s: skipping existing file" +msgstr "%s: преÑкачем поÑтојећу датотеку" + +#: src/extract.c:821 +#, c-format +msgid "%s: Directory renamed before its status could be extracted" +msgstr "" +"%s: Директоријум је преименован пре него што је његово Ñтање могло бити " +"извучено" + +#: src/extract.c:1010 +msgid "Extracting contiguous files as regular files" +msgstr "Извлачим ÑуÑедне датотеке као обичне датотеке" + +#: src/extract.c:1365 +msgid "Attempting extraction of symbolic links as hard links" +msgstr "Покушавам да извучем Ñимболичке везе као чврÑте везе" + +#: src/extract.c:1528 +#, c-format +msgid "%s: Cannot extract -- file is continued from another volume" +msgstr "%s: Ðе могу да извучем — датотека је наÑтавак Ñа другог диÑка" + +#: src/extract.c:1535 src/list.c:1167 +msgid "Unexpected long name header" +msgstr "Ðеочекивано дуго заглавље назива" + +#: src/extract.c:1542 +#, c-format +msgid "%s: Unknown file type '%c', extracted as normal file" +msgstr "%s: Ðепозната врÑта датотеке „%c“, извучена је као обична датотека" + +#: src/extract.c:1568 +#, c-format +msgid "Current %s is newer or same age" +msgstr "Тренутно „%s“ је новије или иÑте ÑтароÑти" + +#: src/extract.c:1620 +#, c-format +msgid "%s: Was unable to backup this file" +msgstr "%s: ÐиÑам могао да направим резерву ове датотеке" + +#: src/extract.c:1767 +#, c-format +msgid "Cannot rename %s to %s" +msgstr "Ðе могу да преименујем „%s“ у „%s“" + +#: src/incremen.c:494 src/incremen.c:536 +#, c-format +msgid "%s: Directory has been renamed from %s" +msgstr "%s: Директоријуму је промењен назив Ñа „%s“" + +#: src/incremen.c:549 +#, c-format +msgid "%s: Directory is new" +msgstr "%s: Директоријум је нов" + +#: src/incremen.c:566 +#, c-format +msgid "%s: directory is on a different filesystem; not dumped" +msgstr "%s: директоријум је на другачијем ÑиÑтему датотека; није изнет" + +#: src/incremen.c:587 +#, c-format +msgid "%s: Directory has been renamed" +msgstr "%s: Директоријум је преименован" + +#: src/incremen.c:1003 src/incremen.c:1018 +msgid "Invalid time stamp" +msgstr "ÐеиÑправна временÑка ознака" + +#: src/incremen.c:1047 +msgid "Invalid modification time" +msgstr "ÐеиÑправно време измене" + +#: src/incremen.c:1057 +msgid "Invalid modification time (nanoseconds)" +msgstr "ÐеиÑправно време измене (наноÑекунде)" + +#: src/incremen.c:1073 +msgid "Invalid device number" +msgstr "ÐеиÑправан број уређаја" + +#: src/incremen.c:1081 +msgid "Invalid inode number" +msgstr "ÐеиÑправан број и-чвора" + +#: src/incremen.c:1137 +#, c-format +msgid "%s: byte %s: %s %.*s... too long" +msgstr "%s: бајт %s: %s %.*s... предуго" + +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 +msgid "Unexpected EOF in snapshot file" +msgstr "Ðеочекиван крај датотеке у датотеци брзог Ñнимка" + +#: src/incremen.c:1159 +#, c-format +msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" +msgstr "%s: бајт %s: %s %s је праћен неиÑправним бајтом 0x%02x" + +#: src/incremen.c:1171 +#, c-format +msgid "" +"%s: byte %s: (valid range %s..%s)\n" +"\t%s %s" +msgstr "" +"%s: бајт %s: (иÑправан опÑег %s..%s)\n" +"\t%s %s" + +#: src/incremen.c:1178 +#, c-format +msgid "%s: byte %s: %s %s" +msgstr "%s: бајт %s: %s %s" + +#: src/incremen.c:1259 +#, c-format +msgid "%s: byte %s: %s" +msgstr "%s: бајт %s: %s" + +#: src/incremen.c:1262 +msgid "Missing record terminator" +msgstr "ÐедоÑтаје окончавал Ñнимања" + +#: src/incremen.c:1368 src/incremen.c:1371 +msgid "Bad incremental file format" +msgstr "Лош Ð·Ð°Ð¿Ð¸Ñ Ð¿Ð¾Ð²ÐµÑ›Ð°Ð²Ð°Ñ˜ÑƒÑ›Ðµ датотеке" + +#: src/incremen.c:1390 +#, c-format +msgid "Unsupported incremental format version: %" +msgstr "Ðеподржано издање повећавајућег запиÑа: %" + +#: src/incremen.c:1545 +#, c-format +msgid "Malformed dumpdir: expected '%c' but found %#3o" +msgstr "Лош директоријум изношења: очекивах „%c“ али нађох „%#3o“" + +#: src/incremen.c:1555 +msgid "Malformed dumpdir: 'X' duplicated" +msgstr "Лош директоријум изношења: „X“ је удвоÑтручено" + +#: src/incremen.c:1568 +msgid "Malformed dumpdir: empty name in 'R'" +msgstr "Лош директоријум изношења: празан назив у „R“" + +#: src/incremen.c:1581 +msgid "Malformed dumpdir: 'T' not preceeded by 'R'" +msgstr "Лош директоријум изношења: иÑпред „T“ не иде „R“" + +#: src/incremen.c:1587 +msgid "Malformed dumpdir: empty name in 'T'" +msgstr "Лош директоријум изношења: празан назив у „T“" + +#: src/incremen.c:1607 +#, c-format +msgid "Malformed dumpdir: expected '%c' but found end of data" +msgstr "Лош директоријум изношења: очекивах „%c“ али нађох крај података" + +#: src/incremen.c:1614 +msgid "Malformed dumpdir: 'X' never used" +msgstr "Лош директоријум изношења: „X“ није никада коришћено" + +#: src/incremen.c:1658 +#, c-format +msgid "Cannot create temporary directory using template %s" +msgstr "Ðе могу да направим привремени директоријум кориÑтећи шаблон „%s“" + +#: src/incremen.c:1719 +#, c-format +msgid "%s: Not purging directory: unable to stat" +msgstr "%s: Ðе чиÑтим директоријум: не могу да добавим податке" + +#: src/incremen.c:1732 +#, c-format +msgid "%s: directory is on a different device: not purging" +msgstr "%s: директоријум је на другом уређају: не чиÑтим" + +#: src/incremen.c:1740 +#, c-format +msgid "%s: Deleting %s\n" +msgstr "%s: Бришем „%s“\n" + +#: src/incremen.c:1745 +#, c-format +msgid "%s: Cannot remove" +msgstr "%s: Ðе могу да уклоним" + +#: src/list.c:217 +#, c-format +msgid "%s: Omitting" +msgstr "%s: Пропуштам" + +#: src/list.c:235 +#, c-format +msgid "block %s: ** Block of NULs **\n" +msgstr "блок %s: ** Блок ÐИШТÐÐ’ÐИХ вредноÑти **\n" + +#: src/list.c:261 +#, c-format +msgid "block %s: ** End of File **\n" +msgstr "блок %s: ** Крај датотеке **\n" + +#: src/list.c:284 src/list.c:1136 src/list.c:1394 +#, c-format +msgid "block %s: " +msgstr "блок %s: " + +#. TRANSLATORS: %s is type of the value (gid_t, uid_t, +#. etc.) +#: src/list.c:751 +#, c-format +msgid "Blanks in header where numeric %s value expected" +msgstr "Празнине у заглављу где је очекивана бројевна „%s“ вредноÑÑ‚" + +#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) +#: src/list.c:806 +#, c-format +msgid "Archive octal value %.*s is out of %s range; assuming two's complement" +msgstr "" +"Октална вредноÑÑ‚ архиве „%.*s“ је ван „%s“ опÑега; Ñматрам да је комплемент " +"двојке" + +#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) +#: src/list.c:817 +#, c-format +msgid "Archive octal value %.*s is out of %s range" +msgstr "Октална вредноÑÑ‚ архиве „%.*s“ је ван „%s“ опÑега" + +#: src/list.c:838 +msgid "Archive contains obsolescent base-64 headers" +msgstr "Ðрхива Ñадржи заÑтарела заглавља оÑнове-64" + +#: src/list.c:852 +#, c-format +msgid "Archive signed base-64 string %s is out of %s range" +msgstr "Ðрхивом потпиÑана ниÑка оÑнове-64 „%s“ је ван „%s“ опÑега" + +#: src/list.c:883 +#, c-format +msgid "Archive base-256 value is out of %s range" +msgstr "ВредноÑÑ‚ оÑнове-256 архиве је ван „%s“ опÑега" + +#. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) +#: src/list.c:912 +#, c-format +msgid "Archive contains %.*s where numeric %s value expected" +msgstr "Ðрхива Ñадржи „%.*s“ где је очекивана бројевна „%s“ вредноÑÑ‚" + +#. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) +#: src/list.c:934 +#, c-format +msgid "Archive value %s is out of %s range %s..%s" +msgstr "ВредноÑÑ‚ архиве „%s“ је ван „%s“ опÑега %s..%s" + +#: src/list.c:1294 +#, c-format +msgid " link to %s\n" +msgstr " веза до „%s“\n" + +#: src/list.c:1302 +#, c-format +msgid " unknown file type %s\n" +msgstr " непозната врÑта датотеке „%s“\n" + +#: src/list.c:1320 +#, c-format +msgid "--Long Link--\n" +msgstr "—Дуга веза—\n" + +#: src/list.c:1324 +#, c-format +msgid "--Long Name--\n" +msgstr "—Дуг назив—\n" + +#: src/list.c:1328 +#, c-format +msgid "--Volume Header--\n" +msgstr "—Заглавље диÑка—\n" + +#: src/list.c:1336 +#, c-format +msgid "--Continued at byte %s--\n" +msgstr "—ÐаÑтављен на бајту %s—\n" + +#: src/list.c:1399 +msgid "Creating directory:" +msgstr "Стварам директоријум:" + +#: src/misc.c:726 +#, c-format +msgid "Renaming %s to %s\n" +msgstr "Преименујем „%s“ у „%s“\n" + +#: src/misc.c:735 src/misc.c:754 +#, c-format +msgid "%s: Cannot rename to %s" +msgstr "%s: Ðе могу да преименујем у „%s“" + +#: src/misc.c:759 +#, c-format +msgid "Renaming %s back to %s\n" +msgstr "Преименујем „%s“ назад на „%s“\n" + +#: src/misc.c:1101 +#, c-format +msgid "%s: File removed before we read it" +msgstr "%s: Датотека је уклоњена пре него што је прочитана" + +#: src/misc.c:1122 +msgid "child process" +msgstr "проиÑтекли процеÑ" + +#: src/misc.c:1131 +msgid "interprocess channel" +msgstr "канал међупроцеÑа" + +#: src/names.c:360 +msgid "command line" +msgstr "линија наредби" + +#: src/names.c:378 +#, c-format +msgid "%s: file list requested from %s already read from %s" +msgstr "%s: ÑпиÑак датотека затражен Ñа „%s“ већ је прочитан Ñа „%s“" + +#: src/names.c:448 src/checkpoint.c:274 +#, c-format +msgid "cannot split string '%s': %s" +msgstr "не могу да поделим ниÑку „%s“: %s" + +#: src/names.c:490 +#, c-format +msgid "%s: file name read contains nul character" +msgstr "%s: прочитан назив датотеке Ñадржи ништаван знак" + +#: src/names.c:824 +msgid "Pattern matching characters used in file names" +msgstr "Знаци поклапања шаблона Ñу коришћени у називима датотека" + +#: src/names.c:826 +msgid "" +"Use --wildcards to enable pattern matching, or --no-wildcards to suppress " +"this warning" +msgstr "" +"КориÑтите „--wildcards“ да укључите поклапање шаблона, или „--no-wildcards“ " +"да потиÑнете ово упозорење" + +#: src/names.c:844 src/names.c:860 +#, c-format +msgid "%s: Not found in archive" +msgstr "%s: ÐиÑам нашао у архиви" + +#: src/names.c:845 +#, c-format +msgid "%s: Required occurrence not found in archive" +msgstr "%s: ÐиÑам нашао у архиви захтевану појаву" + +#: src/names.c:879 +#, c-format +msgid "Archive label mismatch" +msgstr "ÐÐ°Ñ‚Ð¿Ð¸Ñ Ð°Ñ€Ñ…Ð¸Ð²Ðµ не одговара" + +#: src/names.c:1183 +msgid "" +"Using -C option inside file list is not allowed with --listed-incremental" +msgstr "" +"Употреба опције „-C“ унутар ÑпиÑка датотека није допуштена Ñа „--listed-" +"incremental“" + +#: src/names.c:1189 +msgid "Only one -C option is allowed with --listed-incremental" +msgstr "Само једна опција „-C“ је допуштена Ñа „--listed-incremental“" + +#: src/tar.c:87 +#, fuzzy, c-format +msgid "Options '%s' and '%s' both want standard input" +msgstr "Обе опције „-%s“ и „-%s“ желе Ñтандардни улаз" + +#: src/tar.c:164 +#, c-format +msgid "%s: Invalid archive format" +msgstr "%s: ÐеиÑправан Ð·Ð°Ð¿Ð¸Ñ Ð°Ñ€Ñ…Ð¸Ð²Ðµ" + +#: src/tar.c:196 +msgid "GNU features wanted on incompatible archive format" +msgstr "Гнуове функције Ñе траже на неÑаглаÑном запиÑу архиве" + +#: src/tar.c:264 +#, c-format +msgid "" +"Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." +msgstr "" +"Ðепознат Ñтил цитирања „%s“. Пробајте „%s --quoting-style=помоћ“ да добавите " +"ÑпиÑак." + +#: src/tar.c:378 +msgid "" +"GNU 'tar' saves many files together into a single tape or disk archive, and " +"can restore individual files from the archive.\n" +"\n" +"Examples:\n" +" tar -cf archive.tar foo bar # Create archive.tar from files foo and bar.\n" +" tar -tvf archive.tar # List all files in archive.tar verbosely.\n" +" tar -xf archive.tar # Extract all files from archive.tar.\n" +msgstr "" +"Гнуов „тар“ чува заједно више датотека на једној траци или у архиви диÑка, и " +"може да врати појединачне датотеке из архиве.\n" +"\n" +"Примери:\n" +" tar -cf архива.tar пиво вино # Прави „архиву.tar“ из датотека „пиво“ и " +"„вино“.\n" +" tar -tvf архива.tar # Опширно иÑпиÑује Ñве датотеке из „архиве." +"tar“.\n" +" tar -xf архива.tar # Извлачи Ñве датотеке из „архиве.tar“.\n" + +#: src/tar.c:387 +msgid "" +"The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" +"The version control may be set with --backup or VERSION_CONTROL, values " +"are:\n" +"\n" +" none, off never make backups\n" +" t, numbered make numbered backups\n" +" nil, existing numbered if numbered backups exist, simple otherwise\n" +" never, simple always make simple backups\n" +msgstr "" +"Ð¡ÑƒÑ„Ð¸ÐºÑ Ñ€ÐµÐ·ÐµÑ€Ð²Ðµ је „~“, оÑим ако није поÑтављен опцијом „--suffix“ или " +"„SIMPLE_BACKUP_SUFFIX“.\n" +"Управљање издањем може бити поÑтављено опцијом „--backup“ или " +"„VERSION_CONTROL“, вредноÑти Ñу:\n" +"\n" +" none, off — никада не прави резерве\n" +" t, numbered — прави резерве Ñа бројевима\n" +" nil, existing — Ñа бројевима ако поÑтоје резерве Ñа бројевима, у " +"Ñупротном једноÑтавне\n" +" never, simple — увек прави једноÑтавне резерве\n" + +#: src/tar.c:417 +msgid "Main operation mode:" +msgstr "Главни режим радње:" + +#: src/tar.c:420 +msgid "list the contents of an archive" +msgstr "иÑпиÑује Ñадржај архиве" + +#: src/tar.c:422 +msgid "extract files from an archive" +msgstr "извлачи датотеке из архиве" + +#: src/tar.c:425 +msgid "create a new archive" +msgstr "Ñтвара нову архиву" + +#: src/tar.c:427 +msgid "find differences between archive and file system" +msgstr "налази разлике између архиве и ÑиÑтема датотека" + +#: src/tar.c:430 +msgid "append files to the end of an archive" +msgstr "додаје датотеке на крај архиве" + +#: src/tar.c:432 +msgid "only append files newer than copy in archive" +msgstr "додаје Ñамо датотеке које Ñу новије од примерка у архиви" + +#: src/tar.c:434 +msgid "append tar files to an archive" +msgstr "додаје тар датотеке у архиву" + +#: src/tar.c:437 +msgid "delete from the archive (not on mag tapes!)" +msgstr "брише из архиве (не ради на магнетним тракама!)" + +#: src/tar.c:439 +msgid "test the archive volume label and exit" +msgstr "иÑпробава Ð½Ð°Ñ‚Ð¿Ð¸Ñ Ð´Ð¸Ñка архиве и излази" + +#: src/tar.c:444 +msgid "Operation modifiers:" +msgstr "Измењивачи радње:" + +#: src/tar.c:447 +msgid "handle sparse files efficiently" +msgstr "уÑпешно рукује разређеним датотекама" + +#: src/tar.c:448 +msgid "MAJOR[.MINOR]" +msgstr "ГЛÐÐ’ÐИ[.СПОРЕДÐИ]" + +#: src/tar.c:449 +msgid "set version of the sparse format to use (implies --sparse)" +msgstr "поÑтавља издање разређеног запиÑа за употребу (подразумева „--sparse“)" + +#: src/tar.c:451 +msgid "handle old GNU-format incremental backup" +msgstr "рукује Ñтаром увећавајућом резервом Гну-запиÑа" + +#: src/tar.c:453 +msgid "handle new GNU-format incremental backup" +msgstr "рукује новом увећавајућом резервом Гну-запиÑа" + +#: src/tar.c:455 +msgid "dump level for created listed-incremental archive" +msgstr " изноÑи ниво за направљене архиве увећавајуће иÑпиÑане" + +#: src/tar.c:457 +msgid "do not exit with nonzero on unreadable files" +msgstr "не излази Ñа ненулом на нечитљивим датотекама" + +#: src/tar.c:459 +msgid "" +"process only the NUMBERth occurrence of each file in the archive; this " +"option is valid only in conjunction with one of the subcommands --delete, --" +"diff, --extract or --list and when a list of files is given either on the " +"command line or via the -T option; NUMBER defaults to 1" +msgstr "" +" обрађује Ñамо појаву бр. БРОЈ за Ñваку датотеку у архиви; ова опција је " +"иÑправна Ñамо у ÑадејÑтву Ñа једном од поднаредби „--delete“, „--diff“, „--" +"extract“ или „--list“ и када је ÑпиÑак датотека дат или на линији наредби " +"или путем опције „-T“; БРОЈ подразумева 1" + +#: src/tar.c:465 +msgid "archive is seekable" +msgstr "архива може да Ñе претражује" + +#: src/tar.c:467 +msgid "archive is not seekable" +msgstr "архива не може да Ñе претражује" + +#: src/tar.c:469 +msgid "do not check device numbers when creating incremental archives" +msgstr "не проверава бројеве уређаја када Ñтвара увећавајуће архиве" + +#: src/tar.c:472 +msgid "check device numbers when creating incremental archives (default)" +msgstr "проверава бројеве уређаја када Ñтвара увећавајуће архиве (оÑновно)" + +#: src/tar.c:478 +msgid "Overwrite control:" +msgstr "Управљање препиÑивањем:" + +#: src/tar.c:481 +msgid "attempt to verify the archive after writing it" +msgstr "покушава да провери архиву поÑле пиÑања" + +#: src/tar.c:483 +msgid "remove files after adding them to the archive" +msgstr "уклања датотеке поÑле додавања у архиву" + +#: src/tar.c:485 +msgid "don't replace existing files when extracting, treat them as errors" +msgstr "не замењује поÑтојеће датотеке приликом извлачења, Ñматра их грешкама" + +#: src/tar.c:488 +msgid "don't replace existing files when extracting, silently skip over them" +msgstr "не замењује поÑтојеће датотеке приликом извлачења, нечујно их преÑкаче" + +#: src/tar.c:491 +msgid "don't replace existing files that are newer than their archive copies" +msgstr "" +"не замењује поÑтојеће датотеке које Ñу новије од њихових примерака у архиви" + +#: src/tar.c:493 +msgid "overwrite existing files when extracting" +msgstr "препиÑује поÑтојеће датотеке приликом извлачења" + +#: src/tar.c:495 +msgid "remove each file prior to extracting over it" +msgstr "уклања Ñваку датотеку пре извлачења преко ње" + +#: src/tar.c:497 +msgid "empty hierarchies prior to extracting directory" +msgstr "празни хијерархије пре извлачења директоријума" + +#: src/tar.c:499 +msgid "preserve metadata of existing directories" +msgstr "чува мета-податке поÑтојећих директоријума" + +#: src/tar.c:501 +msgid "overwrite metadata of existing directories when extracting (default)" +msgstr "" +"препиÑује мета-податке поÑтојећих директоријума приликом извлачења (оÑновно)" + +#: src/tar.c:504 +msgid "preserve existing symlinks to directories when extracting" +msgstr "" +"очувава поÑтојеће Ñимболичке везе ка директоријумима приликом извлачења" + +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "ДИР" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 +msgid "Select output stream:" +msgstr "Бирање излазног тока:" + +#: src/tar.c:516 +msgid "extract files to standard output" +msgstr "извлачи датотеке на Ñтандардни излаз" + +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 +msgid "COMMAND" +msgstr "ÐÐРЕДБÐ" + +#: src/tar.c:518 +msgid "pipe extracted files to another program" +msgstr "проÑлеђује извучене датотеке другом програму" + +#: src/tar.c:520 +msgid "ignore exit codes of children" +msgstr "занемарује излазне кодове порода" + +#: src/tar.c:522 +msgid "treat non-zero exit codes of children as error" +msgstr "Ñматра не-нулте излазне кодове порода као грешке" + +#: src/tar.c:527 +msgid "Handling of file attributes:" +msgstr "Руковање оÑобинама датотека:" + +#: src/tar.c:530 +msgid "force NAME as owner for added files" +msgstr " приморава ÐÐЗИВ као влаÑника за додате датотеке" + +#: src/tar.c:532 +msgid "force NAME as group for added files" +msgstr " приморава ÐÐЗИВ као групу за додате датотеке" + +#: src/tar.c:533 src/tar.c:768 +msgid "DATE-OR-FILE" +msgstr "ДÐТУМ-ИЛИ-ДÐТОТЕКÐ" + +#: src/tar.c:534 +msgid "set mtime for added files from DATE-OR-FILE" +msgstr "поÑтавља м-време за додате датотеке из ДÐТУМ-ИЛИ-ДÐТОТЕКÐ" + +#: src/tar.c:535 +msgid "CHANGES" +msgstr "ПРОМЕÐЕ" + +#: src/tar.c:536 +msgid "force (symbolic) mode CHANGES for added files" +msgstr " приморава (Ñимболично) режим ПРОМЕÐРза додате датотеке" + +#: src/tar.c:538 +msgid "METHOD" +msgstr "ÐÐЧИÐ" + +#: src/tar.c:539 +msgid "" +"preserve access times on dumped files, either by restoring the times after " +"reading (METHOD='replace'; default) or by not setting the times in the first " +"place (METHOD='system')" +msgstr "" +"очувава времена приÑтупа на изнетим датотекама, било враћањем времена након " +"читања (ÐÐЧИÐ='replace'; оÑновно) или не поÑтављањем времена за време рада " +"(ÐÐЧИÐ='system')" + +#: src/tar.c:543 +msgid "don't extract file modified time" +msgstr "не извлачи измењено време датотеке" + +#: src/tar.c:545 +msgid "" +"try extracting files with the same ownership as exists in the archive " +"(default for superuser)" +msgstr "" +"покушава извлачење датотека Ñа иÑтим влаÑништвом које поÑтоји у архиви " +"(оÑновно је за админиÑтратора)" + +#: src/tar.c:547 +msgid "extract files as yourself (default for ordinary users)" +msgstr "извлачи датотеке као ви Ñами (оÑновно је за обичн екориÑнике)" + +#: src/tar.c:549 +msgid "always use numbers for user/group names" +msgstr "увек кориÑти бројеве за називе кориÑника/групе" + +#: src/tar.c:551 +msgid "extract information about file permissions (default for superuser)" +msgstr "извлчаи податке о овлашћењима датотека (оÑновно је за админиÑтратора))" + +#: src/tar.c:555 +msgid "" +"apply the user's umask when extracting permissions from the archive (default " +"for ordinary users)" +msgstr "" +"примењује кориÑникову умаÑку када извлачи овлашћења из архиве (оÑновно је за " +"обичне кориÑнике)" + +#: src/tar.c:557 +msgid "" +"member arguments are listed in the same order as the files in the archive" +msgstr "аргументи члана Ñе иÑпиÑују иÑтим редом као датотеке у архиви" + +#: src/tar.c:561 +msgid "same as both -p and -s" +msgstr "иÑто и као „-p“ и као „-s“" + +#: src/tar.c:563 +msgid "" +"delay setting modification times and permissions of extracted directories " +"until the end of extraction" +msgstr "" +"одлаже подешавања измене времена и овлашћења извучених директоријума до " +"краја извлачења" + +#: src/tar.c:566 +msgid "cancel the effect of --delay-directory-restore option" +msgstr "отказује дејÑтво опције „--delay-directory-restore“" + +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 +msgid "Handling of extended file attributes:" +msgstr "Руковање проширеним оÑобинама датотека:" + +#: src/tar.c:581 +msgid "Enable extended attributes support" +msgstr "Укључује подршку проширених оÑобина" + +#: src/tar.c:583 +msgid "Disable extended attributes support" +msgstr "ИÑкључује подршку проширених оÑобина" + +#: src/tar.c:584 src/tar.c:586 +msgid "MASK" +msgstr "ÐœÐСКÐ" + +#: src/tar.c:585 +msgid "specify the include pattern for xattr keys" +msgstr "наводи шаблон укључивања за кључеве икÑ-оÑобине" + +#: src/tar.c:587 +msgid "specify the exclude pattern for xattr keys" +msgstr "наводи шаблон иÑкључивања за кључеве икÑ-оÑобине" + +#: src/tar.c:589 +msgid "Enable the SELinux context support" +msgstr "Укључује подршку Ð¡Ð•Ð›Ð¸Ð½ÑƒÐºÑ ÐºÐ¾Ð½Ñ‚ÐµÐºÑта" + +#: src/tar.c:591 +msgid "Disable the SELinux context support" +msgstr "ИÑкључује подршку Ð¡Ð•Ð›Ð¸Ð½ÑƒÐºÑ ÐºÐ¾Ð½Ñ‚ÐµÐºÑта" + +#: src/tar.c:593 +msgid "Enable the POSIX ACLs support" +msgstr "Укључује подршку ПОСИКС ÐЦЛ-ова" + +#: src/tar.c:595 +msgid "Disable the POSIX ACLs support" +msgstr "ИÑкључује подршку ПОСИКС ÐЦЛ-ова" + +#: src/tar.c:600 +msgid "Device selection and switching:" +msgstr "Бирање уређаја и пребацивање:" + +#: src/tar.c:602 +msgid "ARCHIVE" +msgstr "ÐРХИВÐ" + +#: src/tar.c:603 +msgid "use archive file or device ARCHIVE" +msgstr " кориÑти датотеку архиве или уређај ÐРХИВÐ" + +#: src/tar.c:605 +msgid "archive file is local even if it has a colon" +msgstr "датотека архиве је меÑна чак и ако Ñадржи двотачку" + +#: src/tar.c:607 +msgid "use given rmt COMMAND instead of rmt" +msgstr "кориÑти дато „rmt ÐÐРЕДБГ умеÑто „rmt“" + +#: src/tar.c:609 +msgid "use remote COMMAND instead of rsh" +msgstr "кориÑти удаљену ÐÐРЕДБУ умеÑто „rsh“" + +#: src/tar.c:613 +msgid "specify drive and density" +msgstr "одеређује диÑк и гуÑтину" + +#: src/tar.c:627 +msgid "create/list/extract multi-volume archive" +msgstr "Ñтвара/иÑпиÑује/извлачи архиву више диÑкова" + +#: src/tar.c:629 +msgid "change tape after writing NUMBER x 1024 bytes" +msgstr " мења траку након пиÑања БРОЈ x 1024 бајтова" + +#: src/tar.c:631 +msgid "run script at end of each tape (implies -M)" +msgstr "покреће Ñкрипту на крају Ñваке траке (подразумева „-M“)" + +#: src/tar.c:634 +msgid "use/update the volume number in FILE" +msgstr "кориÑти/оÑвежава број диÑка у опцији ДÐТОТЕКÐ" + +#: src/tar.c:639 +msgid "Device blocking:" +msgstr "Блокови уређаја:" + +#: src/tar.c:641 +msgid "BLOCKS" +msgstr "БЛОКОВИ" + +#: src/tar.c:642 +msgid "BLOCKS x 512 bytes per record" +msgstr "БЛОКОВИ x 512 бајта по Ñнимању" + +#: src/tar.c:644 +msgid "NUMBER of bytes per record, multiple of 512" +msgstr "БРОЈ бајтова по Ñнимању, умножак од 512" + +#: src/tar.c:646 +msgid "ignore zeroed blocks in archive (means EOF)" +msgstr "занемарује нулте блокове у архиви (значи крај датотеке)" + +#: src/tar.c:648 +msgid "reblock as we read (for 4.2BSD pipes)" +msgstr "уређује блокове током читања (за 4.2БСД Ñпојке)" + +#: src/tar.c:653 +msgid "Archive format selection:" +msgstr "Избор запиÑа архиве:" + +#: src/tar.c:655 tests/genfile.c:153 +msgid "FORMAT" +msgstr "ЗÐПИС" + +#: src/tar.c:656 +msgid "create archive of the given format" +msgstr " Ñтвара архиву датог запиÑа" + +#: src/tar.c:658 +msgid "FORMAT is one of the following:" +msgstr "ЗÐПИС је један од Ñледећих:" + +#: src/tar.c:659 +msgid "old V7 tar format" +msgstr "Ñтари V7 тар запиÑ" + +#: src/tar.c:662 +msgid "GNU format as per tar <= 1.12" +msgstr "Гнуов Ð·Ð°Ð¿Ð¸Ñ ÐºÐ°Ð¾ за тар <= 1.12" + +#: src/tar.c:664 +msgid "GNU tar 1.13.x format" +msgstr "Ð—Ð°Ð¿Ð¸Ñ Ð“Ð½ÑƒÐ¾Ð²Ð¾Ð³ тара 1.13.x" + +#: src/tar.c:666 +msgid "POSIX 1003.1-1988 (ustar) format" +msgstr "Ð—Ð°Ð¿Ð¸Ñ ÐŸÐžÐ¡Ð˜ÐšÐ¡Ð 1003.1-1988 (ustar)" + +#: src/tar.c:668 +msgid "POSIX 1003.1-2001 (pax) format" +msgstr "Ð—Ð°Ð¿Ð¸Ñ ÐŸÐžÐ¡Ð˜ÐšÐ¡Ð 1003.1-2001 (pax)" + +#: src/tar.c:669 +msgid "same as pax" +msgstr "иÑто као и „pax“" + +#: src/tar.c:672 +msgid "same as --format=v7" +msgstr "иÑто као и „--format=v7“" + +#: src/tar.c:675 +msgid "same as --format=posix" +msgstr "иÑто као и „--format=posix“" + +#: src/tar.c:676 +msgid "keyword[[:]=value][,keyword[[:]=value]]..." +msgstr "кључна реч[[:]=вредноÑÑ‚][,кључна реч[[:]=вредноÑÑ‚]]..." + +#: src/tar.c:677 +msgid "control pax keywords" +msgstr "управља кључним речима пакÑа" + +#: src/tar.c:678 +msgid "TEXT" +msgstr "ТЕКСТ" + +#: src/tar.c:679 +msgid "" +"create archive with volume name TEXT; at list/extract time, use TEXT as a " +"globbing pattern for volume name" +msgstr "" +" Ñтвара архиву Ñа називом диÑка ТЕКСТ; за време иÑпиÑивања/извлачења, " +"кориÑти ТЕКСТ као шаблон шаблонирања за назив диÑка" + +#: src/tar.c:684 +msgid "Compression options:" +msgstr "МогућноÑти Ñажимања:" + +#: src/tar.c:686 +msgid "use archive suffix to determine the compression program" +msgstr "кориÑти ÑÑƒÑ„Ð¸ÐºÑ Ð°Ñ€Ñ…Ð¸Ð²Ðµ да одреди програм Ñажимања" + +#: src/tar.c:688 +msgid "do not use archive suffix to determine the compression program" +msgstr "не кориÑти ÑÑƒÑ„Ð¸ÐºÑ Ð°Ñ€Ñ…Ð¸Ð²Ðµ да одреди програм Ñажимања" + +#: src/tar.c:690 +msgid "PROG" +msgstr "ПРОГРÐÐœ" + +#: src/tar.c:691 +msgid "filter through PROG (must accept -d)" +msgstr "издваја кроз ПРОГРÐÐœ (мора да прихвати „-d“)" + +#: src/tar.c:707 +msgid "Local file selection:" +msgstr "Избор меÑне датотеке:" + +#: src/tar.c:710 +msgid "add given FILE to the archive (useful if its name starts with a dash)" +msgstr "додаје дату ДÐТОТЕКУ у архиву (кориÑно ако њен назив почиње цртицом)" + +#: src/tar.c:712 +msgid "change to directory DIR" +msgstr " прелази у директоријум ДИР" + +#: src/tar.c:714 +msgid "get names to extract or create from FILE" +msgstr "добавља називе да извуче или Ñтвори из ДÐТОТЕКЕ" + +#: src/tar.c:716 +msgid "-T reads null-terminated names, disable -C" +msgstr "„-T“ чита нулом заврешене називе, иÑкључује „-C“" + +#: src/tar.c:718 +msgid "disable the effect of the previous --null option" +msgstr "иÑкључује дејÑтво претходне опције „--null“" + +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" +msgstr "нецитиране називе датотека чита Ñа „-T“ (оÑновно)" + +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" +msgstr "не чита нецитиране називе датотека Ñа „-T“" + +#: src/tar.c:723 tests/genfile.c:136 +msgid "PATTERN" +msgstr "ШÐБЛОÐ" + +#: src/tar.c:724 +msgid "exclude files, given as a PATTERN" +msgstr " иÑкључује датотеке, дате као ШÐБЛОÐ" + +#: src/tar.c:726 +msgid "exclude patterns listed in FILE" +msgstr "иÑкључује шаблоне иÑпиÑане у ДÐТОТЕЦИ" + +#: src/tar.c:728 +msgid "" +"exclude contents of directories containing CACHEDIR.TAG, except for the tag " +"file itself" +msgstr "" +"иÑкључује Ñадржај директоријума који Ñадрже „CACHEDIR.TAG“, оÑим за Ñаму ту " +"ознаку датотеке" + +#: src/tar.c:731 +msgid "exclude everything under directories containing CACHEDIR.TAG" +msgstr "иÑкључује Ñве под директоријумима који Ñадрже „CACHEDIR.TAG“" + +#: src/tar.c:734 +msgid "exclude directories containing CACHEDIR.TAG" +msgstr "иÑкључује директоријуме који Ñадрже „CACHEDIR.TAG“" + +#: src/tar.c:736 +msgid "exclude contents of directories containing FILE, except for FILE itself" +msgstr "" +"иÑкључује Ñадржај директоријума који Ñадрже ДÐТОТЕКУ, оÑим за Ñаму ДÐТОТЕКУ" + +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 +msgid "exclude everything under directories containing FILE" +msgstr "иÑкључује Ñве иÑпод директоријума који Ñадрже ДÐТОТЕКУ" + +#: src/tar.c:747 +msgid "exclude directories containing FILE" +msgstr "иÑкључује директоријуме који Ñадрже ДÐТОТЕКУ" + +#: src/tar.c:749 +msgid "exclude version control system directories" +msgstr "иÑкључује директоријуме ÑиÑтема управљања издањем" + +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 +msgid "exclude backup and lock files" +msgstr "иÑкључује датотеке резерве и закључавања" + +#: src/tar.c:755 +msgid "avoid descending automatically in directories" +msgstr "избегава опадање ÑамоÑтално у директоријима" + +#: src/tar.c:757 +msgid "stay in local file system when creating archive" +msgstr "оÑтаје у меÑном датотека ÑиÑтему када Ñтвара архиву" + +#: src/tar.c:759 +msgid "recurse into directories (default)" +msgstr "дубачи у директоријумима (оÑновно)" + +#: src/tar.c:761 +msgid "don't strip leading '/'s from file names" +msgstr "не уклања водеће / из назива датотека" + +#: src/tar.c:763 +msgid "follow symlinks; archive and dump the files they point to" +msgstr "прати Ñимболичке везе; архивира и изноÑи датотеке на које показују" + +#: src/tar.c:765 +msgid "follow hard links; archive and dump the files they refer to" +msgstr "прати чврÑте везе; архивира и изноÑи датотеке на које упућују" + +#: src/tar.c:766 +msgid "MEMBER-NAME" +msgstr "ÐÐЗИВ-ЧЛÐÐÐ" + +#: src/tar.c:767 +msgid "begin at member MEMBER-NAME when reading the archive" +msgstr "почиње од члана ÐÐЗИВ-ЧЛÐÐРкада чита архиву" + +#: src/tar.c:769 +msgid "only store files newer than DATE-OR-FILE" +msgstr "чува Ñамо датотеке које Ñу новије од ДÐТУМ-ИЛИ-ДÐТОТЕКÐ" + +#: src/tar.c:771 +msgid "DATE" +msgstr "ДÐТУМ" + +#: src/tar.c:772 +msgid "compare date and time when data changed only" +msgstr " упоређује датум и време када Ñе промени Ñамо податак" + +#: src/tar.c:773 +msgid "CONTROL" +msgstr "УПРÐВЉÐЊЕ" + +#: src/tar.c:774 +msgid "backup before removal, choose version CONTROL" +msgstr "прави резерву пре уклањања, бира УПРÐВЉÐЊЕ издањем" + +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 +msgid "STRING" +msgstr "ÐИСКÐ" + +#: src/tar.c:776 +msgid "" +"backup before removal, override usual suffix ('~' unless overridden by " +"environment variable SIMPLE_BACKUP_SUFFIX)" +msgstr "" +" прави резерву пре уклањања, препиÑује уобичајени ÑÑƒÑ„Ð¸ÐºÑ („~“ уколико " +"није препиÑан променљивом окружења „SIMPLE_BACKUP_SUFFIX“)" + +#: src/tar.c:781 +msgid "File name transformations:" +msgstr "Преображавање назива датотеке:" + +#: src/tar.c:783 +msgid "strip NUMBER leading components from file names on extraction" +msgstr "одÑеца БРОЈ водећих ÑаÑтојака из назива датотека приликом извлачења" + +#: src/tar.c:785 +msgid "EXPRESSION" +msgstr "ИЗРÐЗ" + +#: src/tar.c:786 +msgid "use sed replace EXPRESSION to transform file names" +msgstr "кориÑти Ñедов ИЗРÐЗ замене за преображај назива датотека" + +#: src/tar.c:792 +msgid "File name matching options (affect both exclude and include patterns):" +msgstr "" +"Опције поклапања назива датотека (утиче и на шаблоне укључивања и " +"иÑкључивања):" + +#: src/tar.c:795 +msgid "ignore case" +msgstr "занемарује величину Ñлова" + +#: src/tar.c:797 +msgid "patterns match file name start" +msgstr "шаблон Ñе поклапа Ñа почетком назива датотеке" + +#: src/tar.c:799 +msgid "patterns match after any '/' (default for exclusion)" +msgstr "шаблони Ñе поклапају након Ñваке / (оÑновно за иÑкључивања)" + +#: src/tar.c:801 +msgid "case sensitive matching (default)" +msgstr "поклапање величине Ñлова (оÑновно)" + +#: src/tar.c:803 +msgid "use wildcards (default for exclusion)" +msgstr "кориÑти џокере (оÑновно за иÑкључивања)" + +#: src/tar.c:805 +msgid "verbatim string matching" +msgstr "доÑловне" + +#: src/tar.c:807 +msgid "wildcards do not match '/'" +msgstr "џокери Ñе не поклапају Ñа /" + +#: src/tar.c:809 +msgid "wildcards match '/' (default for exclusion)" +msgstr "џокери Ñе поклапају Ñа / (оÑновно за иÑкључивања)" + +#: src/tar.c:814 +msgid "Informative output:" +msgstr "Обавештајни излаз:" + +#: src/tar.c:817 +msgid "verbosely list files processed" +msgstr "опширно иÑпиÑује обрађене датотеке" + +#: src/tar.c:818 +msgid "KEYWORD" +msgstr "КЉУЧÐРРЕЧ" + +#: src/tar.c:819 +msgid "warning control" +msgstr "управља упозорењем" + +#: src/tar.c:821 +msgid "display progress messages every NUMBERth record (default 10)" +msgstr " приказује поруке напредовања Ñваког Ñнимања бр. БРОЈ (оÑновно је 10)" + +#: src/tar.c:823 +msgid "ACTION" +msgstr "РÐДЊÐ" + +#: src/tar.c:824 +msgid "execute ACTION on each checkpoint" +msgstr "извршава РÐДЊУ на Ñвакој тачки провере" + +#: src/tar.c:827 +msgid "print a message if not all links are dumped" +msgstr "иÑпиÑује поруку ако Ñве везе ниÑу изнете" + +#: src/tar.c:828 +msgid "SIGNAL" +msgstr "СИГÐÐЛ" + +#: src/tar.c:829 +msgid "" +"print total bytes after processing the archive; with an argument - print " +"total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " +"SIGQUIT, SIGINT, SIGUSR1 and SIGUSR2; the names without SIG prefix are also " +"accepted" +msgstr "" +" иÑпиÑује укупноÑÑ‚ бајтова након обраде архиве; Ñа аргументом — иÑпиÑује " +"укупно бајтова када је овај СИГÐÐЛ иÑпоручен; Допуштени Ñигнали Ñу: „SIGHUP, " +"SIGQUIT, SIGINT, SIGUSR1 и SIGUSR2“; називи без префикÑа „SIG“ Ñе такође " +"прихватају" + +#: src/tar.c:834 +msgid "print file modification times in UTC" +msgstr "иÑпиÑује времена измена датотеке у КУВ-у" + +#: src/tar.c:836 +msgid "print file time to its full resolution" +msgstr "иÑпиÑује време датотеке у његовом потпуном проÑтирању" + +#: src/tar.c:838 +msgid "send verbose output to FILE" +msgstr "шаље опширан излаз у ДÐТОТЕКУ" + +#: src/tar.c:840 +msgid "show block number within archive with each message" +msgstr "приказује број блока унутар архиве Ñа Ñваком поруком" + +#: src/tar.c:842 +msgid "ask for confirmation for every action" +msgstr "пита за потврду за Ñваку радњу" + +#: src/tar.c:845 +msgid "show tar defaults" +msgstr "приказује оÑновноÑти тара" + +#: src/tar.c:847 +msgid "show valid ranges for snapshot-file fields" +msgstr "показује иÑправне опÑеге за поља датотеке Ñнимка" + +#: src/tar.c:849 +msgid "" +"when listing or extracting, list each directory that does not match search " +"criteria" +msgstr "" +"када иÑпиÑује или извлачи, иÑпиÑује Ñваки директоријум који Ñе не поклапа Ñа " +"уÑловом претраге" + +#: src/tar.c:851 +msgid "show file or archive names after transformation" +msgstr "показује називе датотека или архива након преображаја" + +#: src/tar.c:854 +msgid "STYLE" +msgstr "СТИЛ" + +#: src/tar.c:855 +msgid "set name quoting style; see below for valid STYLE values" +msgstr "поÑтавља Ñтил цитирања назива; видите иÑпод иÑправне вредноÑти СТИЛÐ" + +#: src/tar.c:857 +msgid "additionally quote characters from STRING" +msgstr " додатно цитира знакове из ÐИСКЕ" + +#: src/tar.c:859 +msgid "disable quoting for characters from STRING" +msgstr "иÑкључује цитирање за знакове из ÐИСКЕ" + +#: src/tar.c:864 +msgid "Compatibility options:" +msgstr "Опције ÑаглаÑноÑти:" + +#: src/tar.c:867 +msgid "" +"when creating, same as --old-archive; when extracting, same as --no-same-" +"owner" +msgstr "" +"када Ñтвара, иÑто као „--old-archive“; када извлачи, иÑто као „--no-same-" +"owner“" + +#: src/tar.c:872 +msgid "Other options:" +msgstr "ОÑтале опције:" + +#: src/tar.c:875 +msgid "disable use of some potentially harmful options" +msgstr "иÑкључује употребу неких потенцијално штетних опција" + +#: src/tar.c:1010 +msgid "" +"You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " +"option" +msgstr "" +"Ðе можете навеÑти више од једне опције „-Acdtrux“, „--delete“ или „--test-" +"label“" + +#: src/tar.c:1020 +msgid "Conflicting compression options" +msgstr "Сукобљавајуће опције Ñажимања" + +#: src/tar.c:1079 +#, c-format +msgid "Unknown signal name: %s" +msgstr "Ðепознат назив Ñигнала: %s" + +#: src/tar.c:1103 +msgid "Date sample file not found" +msgstr "ÐиÑам нашао датотеку примерка датума" + +#: src/tar.c:1111 +#, c-format +msgid "Substituting %s for unknown date format %s" +msgstr "Замењујем „%s“ за непознати Ð·Ð°Ð¿Ð¸Ñ Ð´Ð°Ñ‚ÑƒÐ¼Ð° „%s“" + +#: src/tar.c:1140 +#, c-format +msgid "Option %s: Treating date '%s' as %s" +msgstr "Опција „%s“: Сматрам датум „%s“ за „%s“" + +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 +#, c-format +msgid "filter the archive through %s" +msgstr "издваја архиву кроз „%s“" + +#: src/tar.c:1214 +msgid "Valid arguments for the --quoting-style option are:" +msgstr "ИÑправни аргументи за опцију „--quoting-style“ Ñу:" + +#: src/tar.c:1218 +msgid "" +"\n" +"*This* tar defaults to:\n" +msgstr "" +"\n" +"*Овај* тар подразумева опције:\n" + +#: src/tar.c:1330 +msgid "Invalid owner or group ID" +msgstr "ÐеиÑправан влаÑник или ИБ групе" + +#: src/tar.c:1389 +msgid "Invalid blocking factor" +msgstr "ÐеиÑправан блокирајући чинилац" + +#: src/tar.c:1507 +msgid "Invalid tape length" +msgstr "ÐеиÑправна дужина траке" + +#: src/tar.c:1521 +msgid "Invalid incremental level value" +msgstr "ÐеиÑправна увећавајућа вредноÑÑ‚ нивоа" + +#: src/tar.c:1567 +msgid "More than one threshold date" +msgstr "Више од једног датума помака" + +#: src/tar.c:1626 src/tar.c:1629 +msgid "Invalid sparse version value" +msgstr "ÐеиÑправна вредноÑÑ‚ разређеног издања" + +#: src/tar.c:1714 +msgid "--atime-preserve='system' is not supported on this platform" +msgstr "„--atime-preserve='system'“ није подржана на овој платформи" + +#: src/tar.c:1739 +msgid "--checkpoint value is not an integer" +msgstr "вредноÑÑ‚ „--checkpoint“ није цео број" + +#: src/tar.c:1868 +msgid "Invalid mode given on option" +msgstr "ÐеиÑправан режим је дат на опцији" + +#: src/tar.c:1925 +msgid "Invalid number" +msgstr "ÐеиÑправан број" + +#: src/tar.c:1982 +msgid "" +"The --preserve option is deprecated, use --preserve-permissions --preserve-" +"order instead" +msgstr "" +"Опција „--preserve“ је заÑтарела, кориÑтите умеÑто ње „--preserve-" +"permissions --preserve-order“" + +#: src/tar.c:1993 +msgid "Invalid record size" +msgstr "ÐеиÑправна величина запиÑа" + +#: src/tar.c:1996 +#, c-format +msgid "Record size must be a multiple of %d." +msgstr "Величина Ñнимања мора да буде вишеÑтрука од %d." + +#: src/tar.c:2042 +msgid "Invalid number of elements" +msgstr "ÐеиÑправан број елемената" + +#: src/tar.c:2067 +msgid "Only one --to-command option allowed" +msgstr "Дозвољена је Ñамо једна опција „--to-command“" + +#: src/tar.c:2179 +#, c-format +msgid "Malformed density argument: %s" +msgstr "Лош аргумент гуÑтине: %s" + +#: src/tar.c:2205 +#, c-format +msgid "Unknown density: '%c'" +msgstr "Ðепозната гуÑтина: „%c“" + +#: src/tar.c:2222 +#, c-format +msgid "Options '-[0-7][lmh]' not supported by *this* tar" +msgstr "Опције „-[0-7][lmh]“ ниÑу подржане *овим* таром" + +#: src/tar.c:2235 +msgid "[FILE]..." +msgstr "[ДÐТОТЕКÐ]..." + +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 +#, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "„--%s“ не може бити коришћена Ñа „%s“" + +#: src/tar.c:2389 +#, c-format +msgid "Old option '%c' requires an argument." +msgstr "Стара опција „%c“ захтева аргумент." + +#: src/tar.c:2469 +msgid "--occurrence is meaningless without a file list" +msgstr "„--occurrence“ нема значење без ÑпиÑка датотека" + +#: src/tar.c:2490 +msgid "Multiple archive files require '-M' option" +msgstr "Више датотека архиве захтева опцију „-M“" + +#: src/tar.c:2498 +msgid "--level is meaningless without --listed-incremental" +msgstr "„--level“ нема значења без „--listed-incremental“" + +#: src/tar.c:2515 +#, c-format +msgid "%s: Volume label is too long (limit is %lu byte)" +msgid_plural "%s: Volume label is too long (limit is %lu bytes)" +msgstr[0] "%s: ÐÐ°Ñ‚Ð¿Ð¸Ñ Ð´Ð¸Ñка је предуг (ограничење је %lu бајт)" +msgstr[1] "%s: ÐÐ°Ñ‚Ð¿Ð¸Ñ Ð´Ð¸Ñка је предуг (ограничење је %lu бајта)" +msgstr[2] "%s: ÐÐ°Ñ‚Ð¿Ð¸Ñ Ð´Ð¸Ñка је предуг (ограничење је %lu бајтова)" + +#: src/tar.c:2528 +msgid "Cannot verify multi-volume archives" +msgstr "Ðе могу да проверим архиве више диÑкова" + +#: src/tar.c:2530 +msgid "Cannot verify compressed archives" +msgstr "Ðе могу да проверим Ñажете архиве" + +#: src/tar.c:2539 +msgid "Cannot use multi-volume compressed archives" +msgstr "Ðе могу да кориÑтим Ñажете архиве више диÑкова" + +#: src/tar.c:2543 +msgid "Cannot concatenate compressed archives" +msgstr "Ðе могу да Ñпојим Ñажете архиве" + +#: src/tar.c:2553 +msgid "--pax-option can be used only on POSIX archives" +msgstr "„--pax-option“ може бити коришћена Ñамо на ПОСИКС архивама" + +#: src/tar.c:2560 +msgid "--acls can be used only on POSIX archives" +msgstr "„--acls“ може бити коришћена Ñамо на ПОСИКС архивама" + +#: src/tar.c:2565 +msgid "--selinux can be used only on POSIX archives" +msgstr "„--selinux“ може бити коришћена Ñамо на ПОСИКС архивама" + +#: src/tar.c:2570 +msgid "--xattrs can be used only on POSIX archives" +msgstr "„--xattrs“ може бити коришћена Ñамо на ПОСИКС архивама" + +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" +msgstr "" + +#: src/tar.c:2630 +msgid "Volume length cannot be less than record size" +msgstr "Величина диÑка не може бити мања од величине Ñнимка" + +#: src/tar.c:2643 +msgid "Cowardly refusing to create an empty archive" +msgstr "Кукавички одбијам да направим празну архиву" + +#: src/tar.c:2669 +msgid "Options '-Aru' are incompatible with '-f -'" +msgstr "Опције „-Aru“ Ñу неÑаглаÑне Ñа „-f -“" + +#: src/tar.c:2766 +msgid "" +"You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" +msgstr "" +"Можете навеÑти једну од опција „-Acdtrux“, „--delete“ или „--test-label“" + +#: src/tar.c:2823 +#, c-format +msgid "Exiting with failure status due to previous errors" +msgstr "Излазим Ñа Ñтањем неуÑпеха уÑлед претходних грешака" + +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + +#: src/update.c:87 +#, c-format +msgid "%s: File shrank by %s byte" +msgid_plural "%s: File shrank by %s bytes" +msgstr[0] "%s: Датотека је Ñкупљена за %s бајт" +msgstr[1] "%s: Датотека је Ñкупљена за %s бајта" +msgstr[2] "%s: Датотека је Ñкупљена за %s бајтова" + +#: src/xheader.c:165 +#, c-format +msgid "Keyword %s is unknown or not yet implemented" +msgstr "Кључна реч „%s“ је непозната или још није примењена" + +#: src/xheader.c:174 +msgid "Time stamp is out of allowed range" +msgstr "ВременÑка ознака је ван допуштеног опÑега" + +#: src/xheader.c:205 +#, c-format +msgid "Pattern %s cannot be used" +msgstr "Шаблон „%s“ не може бити коришћен" + +#: src/xheader.c:219 +#, c-format +msgid "Keyword %s cannot be overridden" +msgstr "Кључна реч „%s“ не може бити препиÑана" + +#: src/xheader.c:668 +msgid "Malformed extended header: missing length" +msgstr "Лоше проширено заглавље: недоÑтаје дужина" + +#: src/xheader.c:677 +#, c-format +msgid "Extended header length %*s is out of range" +msgstr "Дужина проширеног заглавља „%*s“ је ван опÑега" + +#: src/xheader.c:689 +msgid "Malformed extended header: missing blank after length" +msgstr "Лоше проширено заглавље: недоÑтаје празнина након дужине" + +#: src/xheader.c:697 +msgid "Malformed extended header: missing equal sign" +msgstr "Лоше проширено заглавље: недоÑтаје знак једнакоÑти" + +#: src/xheader.c:703 +msgid "Malformed extended header: missing newline" +msgstr "Лоше проширено заглавље: недоÑтаје нови ред" + +#: src/xheader.c:741 +#, c-format +msgid "Ignoring unknown extended header keyword '%s'" +msgstr "Занемарујем непознату кључну реч „%s“ проширеног заглавља" + +#: src/xheader.c:1013 +#, c-format +msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" +msgstr "Створени пар кључна реч/вредноÑÑ‚ је предуг (кључна реч=%s, дужина=%s)" + +#. TRANSLATORS: The first %s is the pax extended header keyword +#. (atime, gid, etc.). +#: src/xheader.c:1043 +#, c-format +msgid "Extended header %s=%s is out of range %s..%s" +msgstr "Проширено заглавље „%s=%s“ је ван опÑега %s..%s" + +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 +#, c-format +msgid "Malformed extended header: invalid %s=%s" +msgstr "Лоше проширено заглавље: неиÑправно је „%s=%s“" + +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 +#, c-format +msgid "Malformed extended header: excess %s=%s" +msgstr "Лоше проширено заглавље: премашује „%s=%s“" + +#: src/xheader.c:1502 +#, c-format +msgid "Malformed extended header: invalid %s: unexpected delimiter %c" +msgstr "Лоше проширено заглавље: неиÑправно „%s“: неочекивани разделник „%c“" + +#: src/xheader.c:1512 +#, c-format +msgid "Malformed extended header: invalid %s: odd number of values" +msgstr "Лоше проширено заглавље: неиÑправно „%s“: непаран број вредноÑти" + +#: src/checkpoint.c:114 +#, c-format +msgid "%s: not a valid timeout" +msgstr "%s: није иÑправан иÑтек времена" + +#: src/checkpoint.c:121 +#, c-format +msgid "%s: unknown checkpoint action" +msgstr "%s: непозната радња тачке провере" + +#: src/checkpoint.c:202 +msgid "write" +msgstr "пиÑање" + +#: src/checkpoint.c:202 +msgid "read" +msgstr "читање" + +#. TRANSLATORS: This is a "checkpoint of write operation", +#. *not* "Writing a checkpoint". +#. E.g. in Spanish "Punto de comprobaci@'on de escritura", +#. *not* "Escribiendo un punto de comprobaci@'on" +#: src/checkpoint.c:218 +#, c-format +msgid "Write checkpoint %u" +msgstr "Тачка провере радње пиÑања „%u“" + +#. TRANSLATORS: This is a "checkpoint of read operation", +#. *not* "Reading a checkpoint". +#. E.g. in Spanish "Punto de comprobaci@'on de lectura", +#. *not* "Leyendo un punto de comprobaci@'on" +#: src/checkpoint.c:224 +#, c-format +msgid "Read checkpoint %u" +msgstr "Тачка провере радње читања „%u“" + +#: tests/genfile.c:111 +msgid "" +"genfile manipulates data files for GNU paxutils test suite.\n" +"OPTIONS are:\n" +msgstr "" +"Ñтварање датотеке (genfile) управља датотекама података за пробни Ñкуп " +"Гнуовог помагала пакета (GNU paxutils).\n" +"Опције Ñу:\n" + +#: tests/genfile.c:127 +msgid "File creation options:" +msgstr "Опције Ñтварања датотеке:" + +#: tests/genfile.c:128 tests/genfile.c:139 +msgid "SIZE" +msgstr "ВЕЛИЧИÐÐ" + +#: tests/genfile.c:129 +msgid "Create file of the given SIZE" +msgstr "Прави датотеку задате ВЕЛИЧИÐЕ" + +#: tests/genfile.c:131 +msgid "Write to file NAME, instead of standard output" +msgstr "Пише у ÐÐЗИВ датотеке, умеÑто на Ñтандардни излаз" + +#: tests/genfile.c:133 +msgid "Read file names from FILE" +msgstr "Чита називе датотека из ДÐТОТЕКЕ" + +#: tests/genfile.c:135 +msgid "-T reads null-terminated names" +msgstr "„-T“ чита нулом заврешене називе" + +#: tests/genfile.c:137 +msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'" +msgstr "" +"ИÑпуњава датотеку задатим ШÐБЛОÐОМ. ШÐБЛОРје „default“ (оÑновно) или " +"„zeros“ (нуле)" + +#: tests/genfile.c:140 +msgid "Size of a block for sparse file" +msgstr "Величина блока за проређену датотеку" + +#: tests/genfile.c:142 +msgid "Generate sparse file. Rest of the command line gives the file map." +msgstr "Ствара проређену датотеку. ОÑтатак линије наредби даје мапу датотеке." + +#: tests/genfile.c:144 +msgid "OFFSET" +msgstr "ПОМЕРÐЈ" + +#: tests/genfile.c:145 +msgid "Seek to the given offset before writing data" +msgstr "Премотава на задати померај пре запиÑивања података" + +#: tests/genfile.c:151 +msgid "File statistics options:" +msgstr "Опције ÑтатиÑтичке датотеке:" + +#: tests/genfile.c:154 +msgid "Print contents of struct stat for each given file. Default FORMAT is: " +msgstr "" +"ИÑпиÑује Ñадржаје Ñтања Ñтруктуре за Ñваку дату датотеку. ОÑновни ЗÐПИС је:" + +#: tests/genfile.c:161 +msgid "Synchronous execution options:" +msgstr "Опције уÑаглашеног извршавања:" + +#: tests/genfile.c:163 +msgid "OPTION" +msgstr "ОПЦИЈÐ" + +#: tests/genfile.c:164 +msgid "" +"Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, " +"--unlink" +msgstr "" +"Извршава ÐРГУМЕÐТЕ. КориÑно уз „--checkpoint“ и уз једну од „--cut“, „--" +"append“, „--touch“, „--unlink“" + +#: tests/genfile.c:167 +msgid "Perform given action (see below) upon reaching checkpoint NUMBER" +msgstr "Обавља задату радњу (видите иÑпод) након доÑтизања БРОЈРтачке провере" + +#: tests/genfile.c:170 +msgid "Set date for next --touch option" +msgstr "ПоÑтавља датум за Ñледећу опцију „--touch“" + +#: tests/genfile.c:173 +msgid "Display executed checkpoints and exit status of COMMAND" +msgstr "Приказује извршене тачке провере и изноÑи Ñтање ÐÐРЕДБЕ" + +#: tests/genfile.c:178 +msgid "" +"Synchronous execution actions. These are executed when checkpoint number " +"given by --checkpoint option is reached." +msgstr "" +"Радње уÑаглашеног извршавања. Извршавају Ñе када је доÑтигнут број тачке " +"провере задат опцијом „--checkpoint“." + +#: tests/genfile.c:181 +msgid "" +"Truncate FILE to the size specified by previous --length option (or 0, if it " +"is not given)" +msgstr "" +"Скраћује ДÐТОТЕКУ на величину наведену претходном опцијом „--length“ (или 0, " +"ако није дата)" + +#: tests/genfile.c:185 +msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option." +msgstr "" +"Придодаје ВЕЛИЧИÐРбајтова ДÐТОТЕЦИ. ВЕЛИЧИÐРје дата претходном опцијом „--" +"length“" + +#: tests/genfile.c:188 +msgid "Update the access and modification times of FILE" +msgstr "ОÑвежава времена приÑтупа и промена ДÐТОТЕКЕ" + +#: tests/genfile.c:191 +msgid "Execute COMMAND" +msgstr "Извршава ÐÐРЕДБУ" + +#: tests/genfile.c:194 +msgid "Unlink FILE" +msgstr "Развезује ДÐТОТЕКУ" + +#: tests/genfile.c:244 +#, c-format +msgid "Invalid size: %s" +msgstr "ÐеиÑправна величина: %s" + +#: tests/genfile.c:249 +#, c-format +msgid "Number out of allowed range: %s" +msgstr "Број је изван дозвољеног опÑега: %s" + +#: tests/genfile.c:252 +#, c-format +msgid "Negative size: %s" +msgstr "Ðегативна величина: %s" + +#: tests/genfile.c:265 tests/genfile.c:569 +#, c-format +msgid "stat(%s) failed" +msgstr "није уÑпело добављање података за „%s“" + +#: tests/genfile.c:268 +#, c-format +msgid "requested file length %lu, actual %lu" +msgstr "затражена величина датотеке је %lu, а тренутна је %lu" + +#: tests/genfile.c:272 +#, c-format +msgid "created file is not sparse" +msgstr "Ñтворена датотека није проређена" + +#: tests/genfile.c:361 +#, c-format +msgid "Error parsing number near `%s'" +msgstr "Грешка анализе броја близу „%s“" + +#: tests/genfile.c:367 +#, c-format +msgid "Unknown date format" +msgstr "Ðепознат Ð·Ð°Ð¿Ð¸Ñ Ð´Ð°Ñ‚ÑƒÐ¼Ð°" + +#: tests/genfile.c:391 +msgid "[ARGS...]" +msgstr "[ÐРГУМЕÐТИ...]" + +#: tests/genfile.c:428 tests/genfile.c:468 tests/genfile.c:523 +#: tests/genfile.c:673 tests/genfile.c:687 +#, c-format +msgid "cannot open `%s'" +msgstr "не могу да отворим „%s“" + +#: tests/genfile.c:434 +msgid "cannot seek" +msgstr "не могу да премотам" + +#: tests/genfile.c:451 +#, c-format +msgid "file name contains null character" +msgstr "назив датотеке Ñадржи ништаван знак" + +#: tests/genfile.c:518 +#, c-format +msgid "cannot generate sparse files on standard output, use --file option" +msgstr "" +"не могу да Ñтворим проређену датотеку на Ñтандардном излазу, кориÑтите " +"опцију „--file“" + +#: tests/genfile.c:596 +#, c-format +msgid "incorrect mask (near `%s')" +msgstr "неиÑправна маÑка (близу „%s“)" + +#: tests/genfile.c:602 tests/genfile.c:635 +#, c-format +msgid "Unknown field `%s'" +msgstr "Ðепознато поље „%s“" + +#: tests/genfile.c:662 +#, c-format +msgid "cannot set time on `%s'" +msgstr "не могу да подеÑим време на „%s“" + +#: tests/genfile.c:692 +#, c-format +msgid "cannot truncate `%s'" +msgstr "не могу да Ñкратим „%s“" + +#: tests/genfile.c:701 +#, c-format +msgid "command failed: %s" +msgstr "наредба није уÑпела: %s" + +#: tests/genfile.c:706 +#, c-format +msgid "cannot unlink `%s'" +msgstr "не могу да развежем „%s“" + +#: tests/genfile.c:833 +#, c-format +msgid "Command exited successfully\n" +msgstr "Ðаредба је изашла Ñа уÑпехом\n" + +#: tests/genfile.c:835 +#, c-format +msgid "Command failed with status %d\n" +msgstr "Ðаредба није уÑпела Ñа Ñтањем „%d“\n" + +#: tests/genfile.c:839 +#, c-format +msgid "Command terminated on signal %d\n" +msgstr "Ðаредба је окончана Ñигналом %d\n" + +#: tests/genfile.c:841 +#, c-format +msgid "Command stopped on signal %d\n" +msgstr "Ðаредба је зауÑтављена Ñигналом %d\n" + +#: tests/genfile.c:844 +#, c-format +msgid "Command dumped core\n" +msgstr "Језгро изнете наредбе\n" + +#: tests/genfile.c:847 +#, c-format +msgid "Command terminated\n" +msgstr "Ðаредба је окончана\n" + +#: tests/genfile.c:879 +#, c-format +msgid "--stat requires file names" +msgstr "„--stat“ захтева називе датотека" + +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "„--occurrence“ не може бити коришћена Ñа „%s“" + +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "Ðе могу да комбинујем „--listed-incremental“ Ñа „--newer“" + +#~ msgid "--verify cannot be used with %s" +#~ msgstr "„--verify“ не може бити коришћена Ñа „%s“" + +#~ msgid "--preserve-order is not compatible with --listed-incremental" +#~ msgstr "„--preserve-order“ није ÑаглаÑна Ñа „--listed-incremental“" diff --git a/po/sv.gmo b/po/sv.gmo index aabcf98..cb20b8c 100644 Binary files a/po/sv.gmo and b/po/sv.gmo differ diff --git a/po/sv.po b/po/sv.po index f3f5b30..d138e07 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,16 +1,14 @@ # Swedish messages for tar -# Copyright © 1996, 2001, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Copyright © 1996, 2001, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2013 Free Software Foundation, Inc. # This file is distributed under the same license as the tar package. -# Jan Djärv , 2000, 2001, 2004, 2006, 2007, 2008, 2009, 2010, 2011 -# Revision: 1.107 -# -#: src/create.c:1572 +# Jan Djärv , 2000, 2001, 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2013 +#: src/create.c:1574 msgid "" msgstr "" -"Project-Id-Version: tar 1.26\n" +"Project-Id-Version: tar 1.27\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" -"PO-Revision-Date: 2011-03-13 19:23+0100\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" +"PO-Revision-Date: 2013-10-13 16:44+0200\n" "Last-Translator: Jan Djärv \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -79,7 +77,7 @@ msgid " [OPTION...]" msgstr " [FLAGGA...]" #: gnu/argp-help.c:1686 -#, fuzzy, c-format +#, c-format msgid "Try '%s --help' or '%s --usage' for more information.\n" msgstr "Försök med \"%s --help\" eller \"%s --usage\" för mer information.\n" @@ -103,7 +101,7 @@ msgstr "visa denna hjälptext" msgid "give a short usage message" msgstr "ge ett kort hjälpmeddelande" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "NAMN" @@ -142,9 +140,9 @@ msgid "write error" msgstr "skrivfel" #: gnu/getopt.c:549 gnu/getopt.c:578 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: flaggan \"%s\" är tvetydig\n" +msgstr "%s: flaggan \"%s\" är tvetydig, alternativ:" #: gnu/getopt.c:626 gnu/getopt.c:630 #, c-format @@ -441,7 +439,7 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: Funktion \"%s\" misslyckades" @@ -450,56 +448,56 @@ msgstr "%s: Funktion \"%s\" misslyckades" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: Varning: Funktion \"%s\" misslyckades" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: Kan inte ändra rättigheter till %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: Kan inte byta ägare till uid %lu, gid %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: Kan inte skapa hÃ¥rd länk till %s" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Läsfel vid byte %s, när %lu byte lästes" msgstr[1] "%s: Läsfel vid byte %s, när %lu byte lästes" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Varning: Läsfel vid byte %s, när %lu byte lästes" msgstr[1] "%s: Varning: Läsfel vid byte %s, när %lu byte lästes" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: Kunde inte flytta (seek) till %s" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: Varning: Kunde inte flytta (seek) till %s" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: Kan inte skapa symbolisk länk till %s" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -545,9 +543,9 @@ msgid "Cannot connect to %s: resolve failed" msgstr "Kan inte ansluta till %s: namnuppslagning misslyckades" #: lib/rtapelib.c:502 -#, fuzzy, c-format +#, c-format msgid "Cannot redirect files for remote shell" -msgstr "Kan inte exekvera fjärrskal" +msgstr "Kan inte omdirigera filer för fjärrskal" #: lib/rtapelib.c:516 #, c-format @@ -598,8 +596,8 @@ msgstr "Oväntade argument" msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "Styr en bandstation, acceptera kommandon frÃ¥n en fjärrprocess" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "NUMMER" @@ -607,10 +605,10 @@ msgstr "NUMMER" msgid "set debug level" msgstr "sätt felsökningsnivÃ¥" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "FIL" @@ -632,103 +630,111 @@ msgstr "för mÃ¥nga argument" msgid "Garbage command" msgstr "Okänt kommando" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Det här ser inte ut som ett tar-arkiv" -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" -msgstr "Summa skrivna byte" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" msgstr "Summa lästa byte" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "Summa skrivna byte" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Summa borttagna byte: %s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(rör)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "Ogiltigt värde pÃ¥ record_size" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Arkivnamn saknas" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Kan inte verifiera standard in/ut-arkiv" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Arkivet är komprimerat. Använd flaggan %s" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Komprimerade arkiv kan inte uppdateras" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "Vid bandets början, avslutar nu" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "För mÃ¥nga fel, avslutar" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Poststorlek = %lu block" msgstr[1] "Poststorlek = %lu block" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "Block ej vid blockgräns (%lu byte) i arkivet" msgstr[1] "Block ej vid blockgräns (%lu byte) i arkivet" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "Kunde inte söka bakÃ¥t i arkivfilen, den kan vara oläsbar utan -i" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek stannade inte pÃ¥ en postgräns" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: innehÃ¥ller ogiltigt volymnummer" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "Volymnummer flödade över" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Gör iordning volym nummer %d för %s och tryck vagnretur:" -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "Filslut vid förväntat användarsvar" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "VARNING: Arkivet är ofullständigt" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -739,66 +745,66 @@ msgstr "" " q Avsluta programmet\n" " y eller nyrad Fortsätt\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Starta ett underskal\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? Skriv denna lista\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Ingen ny volym; avslutar.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "Filnamn inte angivet, försök igen.\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Ogiltig indata. Skriv ? för hjälp.\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "kommandot \"%s\" misslyckades" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" "%s fortsätter möjligen i denna volym: huvudet innehÃ¥ller ett trunkerat namn" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s fortsätter inte i denna volym" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s har fel storlek (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Denna volym kommer inte i rätt ordning (%s - %s != %s)" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "Arkivet är inte märkt för att stämma med %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "Volym %s överensstämmer inte med %s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -806,7 +812,7 @@ msgstr "" "%s: filnamnet är för lÃ¥ngt för att lagras i huvudet för ett GNU " "multivolymsarkiv, trunkerat" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "skrivning stannade inte pÃ¥ en blockgräns" @@ -817,16 +823,16 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Kunde bara läsa %lu av %lu byte" msgstr[1] "Kunde bara läsa %lu av %lu byte" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "InnehÃ¥llet är olika" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "Oväntat filslut i arkivet" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "Filtyper är olika" @@ -846,7 +852,7 @@ msgstr "Gid är olika" msgid "Mod time differs" msgstr "Modifieringstiderna är olika" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Storlekarna är olika" @@ -863,36 +869,36 @@ msgstr "Symboliska länkar är olika" msgid "Device number differs" msgstr "Enhetsnummer är olika" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Verifierar " -#: src/compare.c:471 -#, fuzzy, c-format +#: src/compare.c:473 +#, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "%s: Okänd filtyp \"%c\" jämförd som en normal fil" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "Arkivet innehÃ¥ller filnamn med inledande prefix borttaget." -#: src/compare.c:533 +#: src/compare.c:535 msgid "Archive contains transformed file names." msgstr "Arkivet innehÃ¥ller konverterade filnamn." -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "Verifiering kan misslyckas med att hitta originalfiler." -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "VERIFIKATIONSFEL: %d felaktigt arkivhuvud upptäckt" msgstr[1] "VERIFIKATIONSFEL: %d felaktiga arkivhuvuden upptäckta" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "Ett ensamt nollblock vid %s" @@ -938,55 +944,55 @@ msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "%s: Fil krympte med %s byte, fyller ut med nolltecken" msgstr[1] "%s: Fil krympte med %s byte, fyller ut med nolltecken" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: filen finns pÃ¥ ett annat filsystem; inte arkiverad" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "innehÃ¥llet inte arkiverat" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Okänd filtyp; filen ignorerad" -#: src/create.c:1549 +#: src/create.c:1551 #, c-format msgid "Missing links to %s." msgstr "Det fattas länkar till %s." -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: filen är oförändrad; inte arkiverad" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: filen är själva arkivet; inte arkiverad" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "katalog inte arkiverad" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: fil ändrades under tiden vi läste den" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: socketfil ignorerad" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: door-fil ignorerad" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Hoppar till nästa filhuvud" @@ -1012,7 +1018,7 @@ msgstr "%s: Oväntad inkonsistens när katalog skapades" #: src/extract.c:705 #, c-format msgid "%s: skipping existing file" -msgstr "" +msgstr "%s: hoppar över existerande fil" #: src/extract.c:821 #, c-format @@ -1032,12 +1038,12 @@ msgstr "Försöker extrahera symboliska länkar som hÃ¥rda länkar" msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Kan inte extrahera -- filen fortsätter frÃ¥n en annan volym" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" msgstr "Oväntat huvud för lÃ¥ngt filnamn" #: src/extract.c:1542 -#, fuzzy, c-format +#, c-format msgid "%s: Unknown file type '%c', extracted as normal file" msgstr "%s: Okänd filtyp \"%c\", extraherad som en normal fil" @@ -1067,165 +1073,166 @@ msgid "%s: Directory is new" msgstr "%s: Katalogen är ny" #: src/incremen.c:566 -#, fuzzy, c-format +#, c-format msgid "%s: directory is on a different filesystem; not dumped" -msgstr "%s: filen finns pÃ¥ ett annat filsystem; inte arkiverad" +msgstr "%s: katalogen finns pÃ¥ ett annat filsystem; inte arkiverad" #: src/incremen.c:587 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: Katalogen har bytt namn" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "Ogiltigt värde pÃ¥ tidsvärde" -#: src/incremen.c:1045 -#, fuzzy +#: src/incremen.c:1047 msgid "Invalid modification time" -msgstr "Ogiltig modifikationstid (sekunder)" +msgstr "Ogiltig modifikationstid" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "Ogiltig modifikationstid (nanosekunder)" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "Ogiltigt enhetsnummer" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Ogiltigt inodnummer" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" -msgstr "" +msgstr "%s: byte %s: %s %.*s... för lÃ¥ng" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" msgstr "Oväntat filslut i ögonblicksfil" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" -msgstr "" +msgstr "%s: byte %s: %s %s följs av ogilitg byte 0x%02x" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" +"%s: byte %s: (giltigt intervall %s..%s)\n" +"\t%s %s" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" -msgstr "" +msgstr "%s: byte %s: %s %s" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" -msgstr "" +msgstr "%s: byte %s: %s" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "Postavslutare fattas" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "Felaktigt filformat för inkrementell säkerhetskopiering" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "" "Formatversion för inkrementell säkerhetskopiering stöds inte: %" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "Felaktig dumpkatalog: förväntade \"%c\" men hittade %#3o" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Felaktig dumpkatalog: \"X\" duplicerad" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Felaktig dumpkatalog: tomt namn i \"R\"" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Felaktig dumpkatalog: \"T\" föregÃ¥s inte av \"R\"" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Felaktig dumpkatalog: tomt namn i \"T\"" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "Felaktig dumpkatalog: förväntade \"%c\" men hittade dataslut" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "Felaktig dumpkatalog: \"X\" används inte" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Kan inte skapa temporärkatalog med mall %s" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Rensar inte katalog: kunde inte ta status" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: katalogen finns pÃ¥ ett annat filsystem; inte rensad" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Tar bort %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: Kan inte ta bort" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: Utelämnad" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "block %s: ** Block av nolltecken **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "block %s: ** Filslut **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "block %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Blanka i huvud där numeriskt värde av typ %s förväntades" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1233,124 +1240,123 @@ msgstr "" "komplement" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Arkivets oktala värde %.*s är utanför intervallet för %s" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "Arkivet innehÃ¥ller förÃ¥ldrade \"base-64\"-huvuden" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Arkivets \"base-64\"-sträng \"%s\" är utanför intervallet för %s" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Arkivets \"base-256\"-värde är utanför intervallet för %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Arkivet innehÃ¥ller %.*s där ett numeriskt värde av typ %s förväntades" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Arkivets värde %s är utanför intervallet för %s: %s..%s" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " länk till %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " okänd filtyp \"%s\"\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--LÃ¥ng länk--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--LÃ¥ngt namn--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Volymhuvud--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Fortsätter vid byte %s--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Skapar katalog:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "Byter namn pÃ¥ %s till %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Kan inte byta namn till %s" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "Byter namn pÃ¥ %s tillbaka till %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Fil borttagen innan vi läste den" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "barnprocess" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "interprocesskanal" #: src/names.c:360 -#, fuzzy msgid "command line" -msgstr "kommandot \"%s\" misslyckades" +msgstr "kommandorad" #: src/names.c:378 -#, fuzzy, c-format +#, c-format msgid "%s: file list requested from %s already read from %s" -msgstr "%s: fillistan redan läst" +msgstr "%s: fillista begärd frÃ¥n %s redan läst frÃ¥n %s" -#: src/names.c:448 -#, fuzzy, c-format +#: src/names.c:448 src/checkpoint.c:274 +#, c-format msgid "cannot split string '%s': %s" -msgstr "kan inte sätta tid pÃ¥ \"%s\"" +msgstr "kan inte dela sträng \"%s\": %s" #: src/names.c:490 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: filnamnet som lästes innehÃ¥ller nolltecken" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "Mönstermatchningstecken används i filnamn" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1358,54 +1364,53 @@ msgstr "" "Använd --wildcards för att slÃ¥ pÃ¥ mönstermatchning, eller --no-wildcards för " "att undertrycka denna varning" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: Fanns inte i arkivet" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Nödvändig förekomst hittades inte i arkivet" -#: src/names.c:876 +#: src/names.c:879 #, c-format msgid "Archive label mismatch" msgstr "Arkivmärkning stämmer inte överrens" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "Att används -C i en fillista är inte tillÃ¥tet med --listed-incremental" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Bara en -C-flagga är tillÃ¥tet med --listed-incremental" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "Flaggorna \"-%s\" och \"-%s\" vill bÃ¥da läsa frÃ¥n standard in" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s: Ogiltigt arkivformat" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "GNU-tillägg önskade i ett inkompatibelt arkivformat" -#: src/tar.c:255 -#, fuzzy, c-format +#: src/tar.c:264 +#, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." msgstr "" "Okänd citeringsstil \"%s\". Gör \"%s --quoting-style=help för att fÃ¥ en " "lista." -#: src/tar.c:364 -#, fuzzy +#: src/tar.c:378 msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1423,8 +1428,7 @@ msgstr "" " tar -tvf arkiv.tar # Visa filer i arkiv.tar, all information.\n" " tar -xf arkiv.tar # Extrahera alla filer i arkiv.tar.\n" -#: src/tar.c:373 -#, fuzzy +#: src/tar.c:387 msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" "The version control may be set with --backup or VERSION_CONTROL, values " @@ -1446,80 +1450,80 @@ msgstr "" "annars\n" " never, simple gör alltid enkla säkerhetskopior\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "Operationsläge:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "visa innehÃ¥llet i arkivet" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "extrahera filer frÃ¥n arkivet" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "skapa ett nytt arkiv" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "visa skillnader mellan filsystemet och arkivet" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "lägg till filer pÃ¥ slutet av arkivet" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "lägg till filer som är nyare än de i arkivet" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "lägg till innehÃ¥llet i en arkivfil till arkivet" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "ta bort frÃ¥n arkivet (inte för arkiv pÃ¥ magnetband!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "verifiera arkivets volymnamn och avsluta." -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "Modifiera operationslägen:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "hantera filer med hÃ¥l mer effektivt" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "ÖVRE[.UNDRE]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" "ange vilken formatversion som ska hantera filer med hÃ¥l (implicerar --sparse)" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "hantera gamla GNU-formatet för inkrementell säkerhetskopiering" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "hantera nya GNU-formatet för inkrementell säkerhetskopiering" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "dumpa nivÃ¥ för \"listed-incremental\" arkiv" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "avsluta inte med felslutstatus p.g.a. oläsbara filer" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1531,132 +1535,137 @@ msgstr "" "list och när en lista av filer anges antingen pÃ¥ kommandoraden eller med " "flaggan -T. Standardvärde för NUMMER är 1." -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "arkivet är sökbart" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "arkivet är inte sökbart" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "kontrollera inte enhetsnummer när inkrementella arkiv skapas" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" "kontrollera enhetsnummer när inkrementella arkiv skapas (standardvärde)" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "Kontrollera överskrivning:" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "försök verifiera arkivet efter det skapats" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "ta bort filer efter de sparats i arkivet" -#: src/tar.c:471 -#, fuzzy +#: src/tar.c:485 msgid "don't replace existing files when extracting, treat them as errors" -msgstr "ersätt inte befintliga filer vid extrahering" +msgstr "ersätt inte befintliga filer vid extrahering, behandla dem som fel" -#: src/tar.c:474 -#, fuzzy +#: src/tar.c:488 msgid "don't replace existing files when extracting, silently skip over them" -msgstr "ersätt inte befintliga filer vid extrahering" +msgstr "ersätt inte befintliga filer vid extrahering, hoppa tyst över dem" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "ersätt inte befintliga filer som är nyare än de som finns i arkivet" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "skriv över befintliga filer vid extrahering" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "ta bort befintliga filer innan de nya extraheras" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "töm kataloghierarkier före extrahering av katalog" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "bevara befintliga katalogers metadata" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "skriv över metadata för befintliga kataloger vid extrahering (standardvärde)" -#: src/tar.c:490 -#, fuzzy +#: src/tar.c:504 msgid "preserve existing symlinks to directories when extracting" -msgstr "skriv över befintliga filer vid extrahering" +msgstr "bevara befintliga symboliska länkar till kataloger vid extrahering" + +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "KATALOG" -#: src/tar.c:496 +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "Välj utdataström:" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "extrahera filer till standard ut" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "KOMMANDO" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "extrahera filer till standard in för ett annat program" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "ignorera barnprocessers slutstatus" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "behandla slutstats frÃ¥n barnprocesser skiljt ifrÃ¥n noll som fel" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Hantering av filattribut:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "sätt NAMN som ägare för adderade filer" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "sätt NAMN som grupp för adderade filer" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "DATUM-ELLER-FIL" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "sätt modifieringstid pÃ¥ adderade filer frÃ¥n DATUM-ELLER-FIL" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "RÄTTIGHET" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "sätt (symbolisk) RÄTTIGHET för adderade filer" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "METOD" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " @@ -1666,11 +1675,11 @@ msgstr "" "tiderna efter läsning (METOD=\"replace\", standardvärde) eller genom att " "inte sätta tiderna alls (METOD=\"system\")" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "extrahera inte filers modifieringstid" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" @@ -1678,21 +1687,21 @@ msgstr "" "försök extrahera filer med samma ägare som i arkivet (standardvärde för " "superanvändaren)" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "" "extrahera filer med dig själv som ägare (standardvärde för vanliga användare)" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "använd alltid tal för användar- och gruppnamn" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" "extrahera information om filrättigheter (standardvärde för superanvändare)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1700,16 +1709,16 @@ msgstr "" "applicera användarens umask när rättigheter extraheras frÃ¥n arkivet " "(standardvärde för vanliga användare)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" -msgstr "" +msgstr "namnargument är givna i samma ordning som filerna förekommer i arkivet" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "samma som bÃ¥de -p och -s" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1717,180 +1726,187 @@ msgstr "" "fördröj sättandet av modifikationstider och rättigheter pÃ¥ extraherade " "kataloger till slutet pÃ¥ arkivextraheringen." -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "ta bort effekten av flaggan --delay-directory-restore" -#: src/tar.c:554 -#, fuzzy +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 msgid "Handling of extended file attributes:" -msgstr "Hantering av filattribut:" +msgstr "Hantering av utökade filattribut:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" -msgstr "" +msgstr "Aktivera stöd för utökade attribut" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" -msgstr "" +msgstr "Avaktivera stöd för utökade attribut" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" -msgstr "" +msgstr "MÖNSTER" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" -msgstr "" +msgstr "ange inkuderingsmönster för xattr-nycklar" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" -msgstr "" +msgstr "ange exkluderingsmönster för xattr-nycklar" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" -msgstr "" +msgstr "Aktivera stöd för SELinux-omgivningar" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" -msgstr "" +msgstr "Avaktivera stöd för SELinux-omgivningar" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" -msgstr "" +msgstr "Aktivera stöd för POSIX ACL" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" -msgstr "" +msgstr "Avaktivera stöd för POSIX ACL" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "Enhetsval och enhetsbyte:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ARKIV" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "använd arkivfil eller enhet ARKIV" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "arkivfilen är lokal även om namnet har kolon" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "använd KOMMANDO istället för rmt" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "använd KOMMANDO istället för rsh" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "ange enhet och densitet" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "skapa/visa/extrahera ett flervolymsarkiv" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "byt band efter det att NUMMER x 1024 byte skrivits" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "kör kommandofil vid slutet av varje band (flaggan -M sätts ocksÃ¥)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "använd/uppdatera volymnummer i FIL" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "Blockhantering:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "BLOCK" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "BLOCK x 512 byte per post" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "NUMMER byte per post, multipel av 512" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "ignorera block med enbart nolltecken (betyder filslut)" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "omblocka vid läsning (för 4.2BSD-rör)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "Val av arkivformat:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "FORMAT" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "skapa ett arkiv med givet format" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "FORMAT är ett av följande:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "gammalt V7 format" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "GNU-format enligt tar <= 1.12" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "Format frÃ¥n GNU tar 1.13.x" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) format" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) format" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "samma som pax" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "samma som --format=v7" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "samma som --format=posix" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "nyckelord[[:]=värde][,nyckelord[[:]=värde], ...]" -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "ange nyckelord för pax" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "NAMN" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1898,76 +1914,74 @@ msgstr "" "skapa ett arkiv med volymnamnet NAMN. Vid visning/extrahering är NAMN ett " "skalmönster (\"globbing\")" -#: src/tar.c:660 +#: src/tar.c:684 msgid "Compression options:" msgstr "Komprimeringsflaggor:" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "använd arkivsuffix för att bestämma komprimeringsprogram" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "använd inte arkivsuffix för att bestämma komprimeringsprogram" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "PROG" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "filtrera genom PROG (mÃ¥ste förstÃ¥ -d)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "Filval:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" "lägg till angiven FIL till arkivet (användbart om FIL börjar med \"-\")" -#: src/tar.c:687 -msgid "DIR" -msgstr "KATALOG" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "byt katalog till KATALOG" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "hämta namn att extrahera eller skapa frÃ¥n FIL" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "-T läser namn Ã¥tskilda med nolltecken, -C obrukbar" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "ta bort effekten av föregÃ¥ende --null-flagga" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" msgstr "avcitera filnamn som lästs med -T (standardvärde)" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" msgstr "avcitera inte filnamn som lästs med -T" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "MÖNSTER" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "utelämna filer som matchar MÖNSTER" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "utelämna filer som matchar mönster i FIL" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1975,93 +1989,105 @@ msgstr "" "utelämna innehÃ¥llet i kataloger som innehÃ¥ller CACHEDIR.TAG, förutom " "CACHEDIR.TAG själv" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "utelämna allt i kataloger som innehÃ¥ller CACHEDIR.TAG" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "utelämna kataloger som innehÃ¥ller CACHEDIR.TAG" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "utelämna innehÃ¥llet i kataloger som innehÃ¥ller FIL, förutom FIL själv" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "utelämna allting i kataloger som innehÃ¥ller FIL" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "utelämna kataloger som innehÃ¥ller FIL" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "uteslut kataloger frÃ¥n versionshanteringssystem" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "exkludera säkerhetskopior och lÃ¥sfiler" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "gÃ¥ inte automatiskt ned i kataloger" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "byt inte filsystem när arkivet skapas" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "gÃ¥ rekursivt ned i kataloger (standardvärde)" -#: src/tar.c:729 -#, fuzzy +#: src/tar.c:761 msgid "don't strip leading '/'s from file names" msgstr "tag inte bort inledande \"/\" frÃ¥n namn" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "följ symboliska länkar, arkivera filerna de pekar pÃ¥" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "följ hÃ¥rda länkar, arkivera filerna de pekar pÃ¥" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "NAMN" -#: src/tar.c:735 -#, fuzzy +#: src/tar.c:767 msgid "begin at member MEMBER-NAME when reading the archive" -msgstr "börja med fil NAMN i arkivet" +msgstr "börja med fil NAMN när arkivet läses" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "arkivera bara filer nyare än DATUM-ELLER-FIL" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "DATUM" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "jämför datum och tid endast för dataändringar" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "KONTROLL" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "gör säkerhetskopior före borttagning, välj typ av versionshantering" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "STRÄNG" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -2070,102 +2096,99 @@ msgstr "" "säkerhetskopieändelsen (\"~\" om inte ändrad med miljövariabeln " "SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "Filnamnstransformationer:" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "" "ta bort NUMMER stycken inledande komponenter frÃ¥n filnamn före extrahering" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "UTTRYCK" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "använd seds ersättnings-UTTRYCK för att transformera filnamn" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "Flaggor för filnamnsmatchning (pÃ¥verkar bÃ¥de uteslutnings- och " "inkluderingsmönster):" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "matcha gemener och versaler lika" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "mönster mÃ¥ste matcha i början pÃ¥ filnamn" -#: src/tar.c:767 -#, fuzzy +#: src/tar.c:799 msgid "patterns match after any '/' (default for exclusion)" msgstr "mönster matchas efter \"/\" i filnamn (standardvärde vid uteslutning)" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "matcha gemener och versaler olika (standardvärde)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "använd jokertecken (standardvärde för uteslutning)" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "ordagrann strängjämförelse" -#: src/tar.c:775 -#, fuzzy +#: src/tar.c:807 msgid "wildcards do not match '/'" msgstr "jokertecken matchar inte \"/\"" -#: src/tar.c:777 -#, fuzzy +#: src/tar.c:809 msgid "wildcards match '/' (default for exclusion)" msgstr "jokertecken matchar \"/\" (standardvärde för uteslutning)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Informativ utskrift:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "visa namn pÃ¥ alla filer som behandlas" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "NYCKELORD" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "varningskontroll" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" "visa förloppsmeddelande efter varje grupp om NUMMER poster (standardvärde 10)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "Ã…TGÄRD" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "utför Ã…TGÄRD vid vare kontrollpunkt" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "visa ett meddelande om inte alla länkar arkiverats" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "SIGNAL" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2176,35 +2199,35 @@ msgstr "" "totalt antal byte när SIGNAL levereras. TillÃ¥ta signaler är: SIGHUP, " "SIGQUIT, SIGINT, SIGUSR1 coh SIGUSR2. Namn utan SIG-prefix accepteras ocksÃ¥." -#: src/tar.c:802 +#: src/tar.c:834 msgid "print file modification times in UTC" msgstr "visa filers modifieringstid i UTC" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "visa full upplösning pÃ¥ filtider" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "skicka informativa meddelanden till FIL" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "visa blocknummer inom arkivet för varje meddelande" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "frÃ¥ga efter bekräftelse för varje steg" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "visa standardvärden för \"tar\"" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" -msgstr "" +msgstr "visa giltiga intervall för fält i ögonblicksfil" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2212,31 +2235,31 @@ msgstr "" "vid visning eller extrahering, visa varje katalog som inte matchar " "sökkriterium" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "visa fil- eller arkivnamn efter transformering" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "STIL" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "sätt citatstil för namn. Se nedan för giltiga vären pÃ¥ STIL." -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "citera även tecken i STRÄNG" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "citera inte tecken i STRÄNG" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "Kompatibilitetsflaggor:" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2244,55 +2267,56 @@ msgstr "" "vid skapande, samma som --old-archive. Vid extrahering, samma som --no-same-" "owner" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "Andra flaggor:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "begränsa användningen av eventuellt farliga flaggor" -#: src/tar.c:978 -#, fuzzy +#: src/tar.c:1010 msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" -msgstr "Du kan endast ange en av flaggorna \"-Acdtrux eller \"--test-label\"" +msgstr "" +"Du kan endast ange en av flaggorna \"-Acdtrux, \"--delete\" eller \"--test-" +"label\"" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Motstridiga komprimeringsflaggor" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "Okänt signalnamn: %s" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "Tidsfil hittades inte" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Använder %s istället för okänt datumformat %s" -#: src/tar.c:1108 -#, fuzzy, c-format +#: src/tar.c:1140 +#, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "Flagga %s: Tolkar tidsangivelse \"%s\" som %s" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "filtrera arkivet genom %s" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "Giltiga argument till flaggan --quoting-style är:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2300,48 +2324,47 @@ msgstr "" "\n" "*Denna* tar har standardvärdena:\n" -#: src/tar.c:1295 -#, fuzzy +#: src/tar.c:1330 msgid "Invalid owner or group ID" -msgstr "Ogiltig ägare" +msgstr "Ogiltig ägare eller grupp-id" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Ogiltig blockfaktor" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "Ogiltig bandlängd" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "Felaktigt värde fär inkrementell nivÃ¥" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "Mer än en datumgräns" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "Ogiltig version för filer med hÃ¥l" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve=\"system\" stöds inte pÃ¥ denna plattform" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "--checkpoint-värdet är inte ett heltal" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Ogiltiga rättigheter givna för flagga" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "Ogiltigt nummer" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" @@ -2349,149 +2372,138 @@ msgstr "" "Flaggan --preserve är förÃ¥ldrad, använd --preserve-permissions --preserve-" "order istället" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Ogiltig poststorlek" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "Poststorlek mÃ¥ste vara en multipel av %d" -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "Ogiltig antal element" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "Endast en --to-command flagga tillÃ¥ten" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "Ogiltig densitetsangivelse: %s" -#: src/tar.c:2133 -#, fuzzy, c-format +#: src/tar.c:2205 +#, c-format msgid "Unknown density: '%c'" msgstr "Okänd densitet: \"%c\"" -#: src/tar.c:2150 -#, fuzzy, c-format +#: src/tar.c:2222 +#, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "Flaggorna \"-[0-7][lmh]\" stöds inte av *detta* tar-program" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[FIL]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 #, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "flaggan --%s kan inte användas med %s" + +#: src/tar.c:2389 +#, c-format msgid "Old option '%c' requires an argument." msgstr "Gammal flagga \"%c\" kräver ett argument" -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence är meningslöst utan en fillista" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "--occurrence kan inte användas i det begärda operationsläget." - -#: src/tar.c:2408 -#, fuzzy +#: src/tar.c:2490 msgid "Multiple archive files require '-M' option" msgstr "Multipla arkivfiler kräver \"-M\" flaggan" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "Kan inte kombinera --listed-incremental med --newer" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "--level är meningslös utan --listed-incremental" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "%s: Volymnamn är för lÃ¥ngt (maxlängd är %lu byte)" msgstr[1] "%s: Volymnamn är för lÃ¥ngt (maxlängd är %lu byte)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Flervolymsarkiv kan inte verifieras" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Komprimerade arkiv kan inte verifieras" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "Mönster %s kan inte användas" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Kan inte använda komprimerade flervolymsarkiv" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "Komprimerade arkiv kan inte slÃ¥s samman" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option kan bara användas pÃ¥ POSIX-arkiv" -#: src/tar.c:2478 -#, fuzzy +#: src/tar.c:2560 msgid "--acls can be used only on POSIX archives" -msgstr "--pax-option kan bara användas pÃ¥ POSIX-arkiv" +msgstr "--acls kan bara användas pÃ¥ POSIX-arkiv" -#: src/tar.c:2483 -#, fuzzy +#: src/tar.c:2565 msgid "--selinux can be used only on POSIX archives" -msgstr "--pax-option kan bara användas pÃ¥ POSIX-arkiv" +msgstr "--selinux kan bara användas pÃ¥ POSIX-arkiv" -#: src/tar.c:2488 -#, fuzzy +#: src/tar.c:2570 msgid "--xattrs can be used only on POSIX archives" -msgstr "--pax-option kan bara användas pÃ¥ POSIX-arkiv" +msgstr "--xattrs kan bara användas pÃ¥ POSIX-arkiv" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "Mönster %s kan inte användas" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" +msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "Volymlängden kan inte vara mindre än poststorleken" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "--preserve-order är inte kompatibel med --listed-incremental" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "Vägrar fegt att skapa ett tomt arkiv" -#: src/tar.c:2565 -#, fuzzy +#: src/tar.c:2669 msgid "Options '-Aru' are incompatible with '-f -'" msgstr "Flaggorna \"-Aru\" är inkompatibla med \"-f -\"" -#: src/tar.c:2660 -#, fuzzy +#: src/tar.c:2766 msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" -msgstr "Du mÃ¥ste ange en av flaggorna \"-Acdtrux\" eller --test-label" +msgstr "" +"Du mÃ¥ste ange en av flaggorna \"-Acdtrux\", \"--delete\" eller --test-label" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "Avslutar med felstatus pÃ¥ grund av tidigare fel" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" @@ -2499,98 +2511,98 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: Filen krympte med %s byte" msgstr[1] "%s: Filen krympte med %s byte" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "Nyckelordet %s är okänt eller inte ännu implementerat" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" msgstr "Tidsstämpel är utanför giltigt intervall" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "Mönster %s kan inte användas" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Nyckelord %s kan inte ersättas" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "Felaktigt utökat huvud: längd saknas" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "Längd %.*s pÃ¥ utökat huvud är utanför giltigt intervall" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "Felaktigt utökat huvud: blanktecken efter längdangivelse saknas" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "Felaktigt utökat huvud: likamedtecken saknas" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "Felaktigt utökat huvud: nyrad saknas" -#: src/xheader.c:740 -#, fuzzy, c-format +#: src/xheader.c:741 +#, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "Ignorerar nykelord \"%s\" i utökat huvud" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "Genererat nyckel/värde-par är för lÃ¥ngt (nyckel=%s, längd=%s)" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "Utökat huvud %s=%s är utanför intervallet %s..%s" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Felaktigt utökat huvud: ogiltig %s=%s" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Felaktigt utökat huvud: för mÃ¥nga %s=%s" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "Felaktigt utökat huvud: ogiltigt %s: oväntad avskiljare %c" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "Felaktigt utökat huvud: ogiltigt %s: udda antal värden" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "%s: ogiltig timeout" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "%s: okänd kontrollpunktsÃ¥tgärd" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "skriv" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "läs" @@ -2598,7 +2610,7 @@ msgstr "läs" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "Kontrollpunkt för skrivning %u" @@ -2607,7 +2619,7 @@ msgstr "Kontrollpunkt för skrivning %u" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "Kontrollpunkt för läsning %u" @@ -2816,14 +2828,14 @@ msgid "cannot set time on `%s'" msgstr "kan inte sätta tid pÃ¥ \"%s\"" #: tests/genfile.c:692 -#, fuzzy, c-format +#, c-format msgid "cannot truncate `%s'" -msgstr "kan inte ta bort \"%s\"" +msgstr "kan inte trunkera \"%s\"" #: tests/genfile.c:701 -#, fuzzy, c-format +#, c-format msgid "command failed: %s" -msgstr "kommandot \"%s\" misslyckades" +msgstr "kommando misslyckades: %s " #: tests/genfile.c:706 #, c-format @@ -2865,23 +2877,14 @@ msgstr "Kommandot avslutade\n" msgid "--stat requires file names" msgstr "--stat kräver filnamn" -#~ msgid "Cannot get working directory" -#~ msgstr "Kan inte avgöra arbetskatalog" - -#~ msgid "sort names to extract to match archive" -#~ msgstr "sortera namn som ska extraheras sÃ¥ de passar ihop med arkivet" - -#~ msgid "Field too long while reading snapshot file" -#~ msgstr "Fält för lÃ¥ngt när ögonblicksfil lästes" - -#~ msgid "Read error in snapshot file" -#~ msgstr "Läsfel i ögonblicksfil" +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "--occurrence kan inte användas med %s" -#~ msgid "Unexpected field value in snapshot file" -#~ msgstr "Oväntat fältvärde i ögonblicksfil" +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "Kan inte kombinera --listed-incremental med --newer" -#~ msgid "Extended header length is out of allowed range" -#~ msgstr "Längd pÃ¥ utökat huvud är utanför giltigt intervall" +#~ msgid "--verify cannot be used with %s" +#~ msgstr "--verify kan inte användas med %s" -#~ msgid "Invalid group" -#~ msgstr "Ogiltig grupp" +#~ msgid "--preserve-order is not compatible with --listed-incremental" +#~ msgstr "--preserve-order är inte kompatibel med --listed-incremental" diff --git a/po/tar.pot b/po/tar.pot index 7b89ef3..bce5b8d 100644 --- a/po/tar.pot +++ b/po/tar.pot @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#: src/create.c:1572 +#: src/create.c:1574 #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -98,7 +98,7 @@ msgstr "" msgid "give a short usage message" msgstr "" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "" @@ -406,7 +406,7 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "" @@ -415,56 +415,56 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "" msgstr[1] "" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" msgstr[0] "" msgstr[1] "" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -563,8 +563,8 @@ msgstr "" msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "" @@ -572,10 +572,10 @@ msgstr "" msgid "set debug level" msgstr "" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "" @@ -597,103 +597,110 @@ msgstr "" msgid "Garbage command" msgstr "" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "" -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" +#: src/buffer.c:574 +msgid "Total bytes read" msgstr "" -#: src/buffer.c:528 src/buffer.c:542 -msgid "Total bytes read" +#: src/buffer.c:576 +msgid "Total bytes written" msgstr "" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:577 +msgid "Total bytes deleted" msgstr "" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "" msgstr[1] "" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "" msgstr[1] "" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "" -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -701,71 +708,71 @@ msgid "" " y or newline Continue operation\n" msgstr "" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr "" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr "" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "" @@ -776,16 +783,16 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "" msgstr[1] "" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "" @@ -805,7 +812,7 @@ msgstr "" msgid "Mod time differs" msgstr "" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "" @@ -822,36 +829,36 @@ msgstr "" msgid "Device number differs" msgstr "" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "" -#: src/compare.c:471 +#: src/compare.c:473 #, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "" -#: src/compare.c:533 +#: src/compare.c:535 msgid "Archive contains transformed file names." msgstr "" -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "" -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "" msgstr[1] "" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "" @@ -897,55 +904,55 @@ msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "" msgstr[1] "" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "" -#: src/create.c:1549 +#: src/create.c:1551 #, c-format msgid "Missing links to %s." msgstr "" -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "" @@ -991,7 +998,7 @@ msgstr "" msgid "%s: Cannot extract -- file is continued from another volume" msgstr "" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" msgstr "" @@ -1035,249 +1042,249 @@ msgstr "" msgid "%s: Directory has been renamed" msgstr "" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "" -#: src/incremen.c:1045 +#: src/incremen.c:1047 msgid "Invalid modification time" msgstr "" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" msgstr "" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" msgstr "" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" msgstr "" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" msgstr "" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "" #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr "" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr "" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "" @@ -1290,7 +1297,7 @@ msgstr "" msgid "%s: file list requested from %s already read from %s" msgstr "" -#: src/names.c:448 +#: src/names.c:448 src/checkpoint.c:274 #, c-format msgid "cannot split string '%s': %s" msgstr "" @@ -1300,61 +1307,61 @@ msgstr "" msgid "%s: file name read contains nul character" msgstr "" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "" -#: src/names.c:876 +#: src/names.c:879 #, c-format msgid "Archive label mismatch" msgstr "" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" -#: src/tar.c:86 +#: src/tar.c:87 #, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "" -#: src/tar.c:255 +#: src/tar.c:264 #, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." msgstr "" -#: src/tar.c:364 +#: src/tar.c:378 msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1365,7 +1372,7 @@ msgid "" " tar -xf archive.tar # Extract all files from archive.tar.\n" msgstr "" -#: src/tar.c:373 +#: src/tar.c:387 msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" "The version control may be set with --backup or VERSION_CONTROL, values " @@ -1377,79 +1384,79 @@ msgid "" " never, simple always make simple backups\n" msgstr "" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1457,607 +1464,633 @@ msgid "" "command line or via the -T option; NUMBER defaults to 1" msgstr "" -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "" -#: src/tar.c:471 +#: src/tar.c:485 msgid "don't replace existing files when extracting, treat them as errors" msgstr "" -#: src/tar.c:474 +#: src/tar.c:488 msgid "don't replace existing files when extracting, silently skip over them" msgstr "" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -#: src/tar.c:490 +#: src/tar.c:504 msgid "preserve existing symlinks to directories when extracting" msgstr "" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " "place (METHOD='system')" msgstr "" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" msgstr "" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "" -#: src/tar.c:554 +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 msgid "Handling of extended file attributes:" msgstr "" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" msgstr "" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" msgstr "" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" msgstr "" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" msgstr "" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" msgstr "" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" msgstr "" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" msgstr "" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" msgstr "" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "" -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -#: src/tar.c:660 +#: src/tar.c:684 msgid "Compression options:" msgstr "" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -#: src/tar.c:687 -msgid "DIR" -msgstr "" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +msgid "unquote input file or member names (default)" msgstr "" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +msgid "do not unquote input file or member names" msgstr "" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "" -#: src/tar.c:729 +#: src/tar.c:761 msgid "don't strip leading '/'s from file names" msgstr "" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "" -#: src/tar.c:735 +#: src/tar.c:767 msgid "begin at member MEMBER-NAME when reading the archive" msgstr "" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "" -#: src/tar.c:767 +#: src/tar.c:799 msgid "patterns match after any '/' (default for exclusion)" msgstr "" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "" -#: src/tar.c:775 +#: src/tar.c:807 msgid "wildcards do not match '/'" msgstr "" -#: src/tar.c:777 +#: src/tar.c:809 msgid "wildcards match '/' (default for exclusion)" msgstr "" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2065,306 +2098,300 @@ msgid "" "accepted" msgstr "" -#: src/tar.c:802 +#: src/tar.c:834 msgid "print file modification times in UTC" msgstr "" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "" -#: src/tar.c:978 +#: src/tar.c:1010 msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" msgstr "" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "" -#: src/tar.c:1108 +#: src/tar.c:1140 #, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" -#: src/tar.c:1295 +#: src/tar.c:1330 msgid "Invalid owner or group ID" msgstr "" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "" -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "" -#: src/tar.c:2133 +#: src/tar.c:2205 #, c-format msgid "Unknown density: '%c'" msgstr "" -#: src/tar.c:2150 +#: src/tar.c:2222 #, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "" -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 #, c-format -msgid "Old option '%c' requires an argument." -msgstr "" - -#: src/tar.c:2386 -msgid "--occurrence is meaningless without a file list" +msgid "'%s' cannot be used with '%s'" msgstr "" #: src/tar.c:2389 #, c-format -msgid "--occurrence cannot be used with %s" +msgid "Old option '%c' requires an argument." msgstr "" -#: src/tar.c:2408 -msgid "Multiple archive files require '-M' option" +#: src/tar.c:2469 +msgid "--occurrence is meaningless without a file list" msgstr "" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" +#: src/tar.c:2490 +msgid "Multiple archive files require '-M' option" msgstr "" -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "" msgstr[1] "" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "" -#: src/tar.c:2450 -#, c-format -msgid "--verify cannot be used with %s" -msgstr "" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "" -#: src/tar.c:2478 +#: src/tar.c:2560 msgid "--acls can be used only on POSIX archives" msgstr "" -#: src/tar.c:2483 +#: src/tar.c:2565 msgid "--selinux can be used only on POSIX archives" msgstr "" -#: src/tar.c:2488 +#: src/tar.c:2570 msgid "--xattrs can be used only on POSIX archives" msgstr "" -#: src/tar.c:2493 -#, c-format -msgid "--%s option cannot be used with %s" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "" -#: src/tar.c:2565 +#: src/tar.c:2669 msgid "Options '-Aru' are incompatible with '-f -'" msgstr "" -#: src/tar.c:2660 +#: src/tar.c:2766 msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" msgstr "" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" @@ -2372,98 +2399,98 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "" msgstr[1] "" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" msgstr "" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "" -#: src/xheader.c:740 +#: src/xheader.c:741 #, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "" @@ -2471,7 +2498,7 @@ msgstr "" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "" @@ -2480,7 +2507,7 @@ msgstr "" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "" diff --git a/po/tr.gmo b/po/tr.gmo index 0a893fd..7170e91 100644 Binary files a/po/tr.gmo and b/po/tr.gmo differ diff --git a/po/tr.po b/po/tr.po index ab630f1..dff9a65 100644 --- a/po/tr.po +++ b/po/tr.po @@ -3,12 +3,12 @@ # This file is distributed under the same license as the tar package. # Nilgün Belma Bugüner , 2001,..., 2007. # Volkan Gezer , 2013. -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" "Project-Id-Version: tar 1.26\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" "PO-Revision-Date: 2013-03-09 15:51+0100\n" "Last-Translator: Volkan Gezer \n" "Language-Team: Turkish \n" @@ -102,7 +102,7 @@ msgstr "bu yardım iletisi gösterilir" msgid "give a short usage message" msgstr "kısa bir kullanım iletisi gösterilir" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "Ä°SÄ°M" @@ -436,7 +436,7 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: %s olanaksız" @@ -445,58 +445,58 @@ msgstr "%s: %s olanaksız" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: Uyarı: %s olanaksız" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: Kip %s olarak deÄŸiÅŸtirilemez" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "" "%s: Dosya sahipliÄŸi, Kullanıcı-kimlik %lu ve Grup-kimlik %lu olarak " "deÄŸiÅŸtirilemez." -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: %s'e sabit baÄŸ kurulamıyor" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%1$s: %3$lu bayt okunurken %2$s. baytta okuma hatası" msgstr[1] "%1$s: %3$lu bayt okunurken %2$s. baytta okuma hatası" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" msgstr[0] "%1$s: Uyarı: %3$lu bayt okunurken %2$s. baytta okuma hatası" msgstr[1] "%1$s: Uyarı: %3$lu bayt okunurken %2$s. baytta okuma hatası" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: %s e gidilemiyor" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: Uyarı: %s e gidilemiyor" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: %s'e sembolik baÄŸ oluÅŸturulamıyor" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -595,8 +595,8 @@ msgstr "Beklenmeyen argümanlar" msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "Uzak bir iÅŸlem komutları kabul eden, bir kaset sürücüsü deÄŸiÅŸtir" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "SAYI" @@ -604,10 +604,10 @@ msgstr "SAYI" msgid "set debug level" msgstr "hata ayıklama seviyesini ayarla" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "DOSYA" @@ -629,103 +629,111 @@ msgstr "argüman sayısı çok fazla" msgid "Garbage command" msgstr "Bozuk komut" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Bu bir tar arÅŸivi gibi görünmüyor" -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" -msgstr "Yazılan toplam bayt" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" msgstr "Okunan toplam bayt" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "Yazılan toplam bayt" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Silinen toplam bayt: %s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(boru)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "record_size için geçersiz deÄŸer" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "ArÅŸiv ismi verilmemiÅŸ" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "stdG/stdÇ arÅŸivi doÄŸrulanamaz" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "AeÅŸiv sıkıştırılmış. %s seçeneÄŸini kullanın" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Sıkıştırılmış arÅŸivler güncellenemez" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "Bandın baÅŸlangıcında, ÅŸimdilik çıkıyor" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "Çok hata var, çıkıyor" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Kayıt uzunluÄŸu = %lu blok" msgstr[1] "Kayıt uzunluÄŸu = %lu blok" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "ArÅŸivde hizalanmamış blok (%lu bayt)" msgstr[1] "ArÅŸivde hizalanmamış blok (%lu bayt)" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "ArÅŸiv dosyası geri alınamaz; -i olmaksızın okunamayabilir" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek bir kaydın sınırında durmadı" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: geçersiz bölüm numarası içeriyor" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "Bölüm numarası kapsamdışı" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "#%d. bölümü %s için hazırlamak istiyorsanız return tuÅŸuna basınız: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "Kullanıcı cevabı beklenirken dosya sonuna gelindi" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "UYARI: ArÅŸiv eksik" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -736,72 +744,72 @@ msgstr "" " q Uygulama sonlandırılır\n" " y veya Ä°ÅŸlem sürdürülür\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! bir alt kabuk açılır\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? Bu listeyi basar\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Yeni bölüm yok; çıkıyor.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "Dosya ismi belirtilmemiÅŸ. Tekrar deneyin.\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "Girdi geçersiz, Yardım için ? yazın.\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "%s komutu baÅŸarısız" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s belki de bu bölümde devam ediyor: baÅŸlıktaki isim kırpılmış" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s bu bölümde devam etmiyor" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s yanlış uzunluk (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Bu hacim sıranın dışında (% s -% s =% s)" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "ArÅŸiv etiketi %s ile eÅŸleÅŸmiyor" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "%s bölümü %s ile eÅŸleÅŸmiyor" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "" "%s: dosya ismi GNU çoklu bölüm baÅŸlığında saklanamayacak kadar uzun, kırpıldı" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "yazma bir blok sınırında bitmiyor" @@ -812,16 +820,16 @@ msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Sadece %2$lu baytın %1$lu baytı okunabildi" msgstr[1] "Sadece %2$lu baytın %1$lu baytı okunabildi" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "İçerikler farklı" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "ArÅŸivde beklenmeyen dosya sonu" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "Dosya türleri farklı" @@ -841,7 +849,7 @@ msgstr "Grup-kimlikler farklı" msgid "Mod time differs" msgstr "DeÄŸiÅŸiklik zamanları farklı" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Uzunlukları farklı" @@ -858,36 +866,36 @@ msgstr "Sembolik baÄŸlar farklı" msgid "Device number differs" msgstr "Aygıt numaraları farklı" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "DoÄŸrulama " -#: src/compare.c:471 +#: src/compare.c:473 #, fuzzy, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "%s: '%c' dosya türü bilinmiyor, normal dosya olarak karşılaÅŸtırıldı" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "ArÅŸivdeki dosya isimleri dosya yolu içermiyor." -#: src/compare.c:533 +#: src/compare.c:535 msgid "Archive contains transformed file names." msgstr "ArÅŸiv dönüştürülmüş dosya adları içeriyor." -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "DoÄŸrulama, özgün dosyaların konumlanmasında baÅŸarısız olabilir." -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "DOÄžRULAMA BAÅžARISIZ: %d geçersiz baÅŸlık saptandı" msgstr[1] "DOÄžRULAMA BAÅžARISIZ: %d geçersiz baÅŸlık saptandı" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "%s de tek başına sıfır bloÄŸu" @@ -934,55 +942,55 @@ msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "%s: Dosya %s baytta kaldı; sıfırlarla dolduruluyor" msgstr[1] "%s: Dosya %s baytta kaldı; sıfırlarla dolduruluyor" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: dosya farklı bir dosya sisteminde; dökümlenmedi" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "içerik dökümlenmedi" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Bilinmeyen dosya türü; dosya yoksayıldı" -#: src/create.c:1549 +#: src/create.c:1551 #, c-format msgid "Missing links to %s." msgstr "%s için baÄŸlar kayıp." -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: dosya deÄŸiÅŸmedi; dökümlenmedi" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: dosya arÅŸivdir; dökümlenmedi" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "dizin dökümlenmedi" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: dosya okundu olarak imlendi" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: soket yoksayıldı" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: kapı yoksayıldı" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Sonraki baÅŸlığa atlanıyor" @@ -1028,7 +1036,7 @@ msgstr "Sembolik baÄŸlar, sabit baÄŸlar olarak çıkarılmaya çalışılıyor" msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Dosya çıkarılamaz -- dosyanın başı diÄŸer bölümde" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" msgstr "Umulmadık uzun isim baÅŸlığı" @@ -1072,155 +1080,155 @@ msgstr "%s: dosya farklı bir dosya sisteminde; dökümlenmedi" msgid "%s: Directory has been renamed" msgstr "%s: Dizin adı deÄŸiÅŸtirilmiÅŸti" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "Geçersiz zaman damgası" -#: src/incremen.c:1045 +#: src/incremen.c:1047 #, fuzzy msgid "Invalid modification time" msgstr "DeÄŸiÅŸiklik zamanı (saniye cinsinden) geçersiz" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "DeÄŸiÅŸiklik zamanı (nanosaniye cinsinden) geçersiz" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "Geçersiz aygıt numarası" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Geçersiz düğüm numarası" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" msgstr "" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" msgstr "Anlık görüntü dosyasında beklenmeyen dosya sonu" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" msgstr "" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" msgstr "" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "Kayıt sonlandırıcı eksik" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "Arttırımlı dosya biçimi hatalı" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "Desteklenmeyen arttırımlı biçim sürümü: %" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "dumpdir bozuk: umulan '%c' ama bulunan %#3o" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "dumpdir bozuk: 'X' yinelenmiÅŸ" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "dumpdir bozuk: 'R'deki isim boÅŸ" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "dumpdir bozuk: 'T' 'R' ile öncelenmemiÅŸ" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "dumpdir bozuk: 'T'deki isim boÅŸ" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "dumpdir bozuk: umulan'%c' ama bulunan veri sonu" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "dumpdir bozuk: 'X' hiç kullanılmamış" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "%s ÅŸablonu kullanılarak geçici dizin oluÅŸturulamıyor" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: dizin temizlenmiyor: durumlama yapılamadı" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: dizin farklı bir aygıtta: temizlenmiyor" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: %s siliniyor\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: Kaldırılamaz" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: Geçiliyor" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "blok %s: ** NUL bloku **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "blok %s: ** Dosya Sonu **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "blok %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Sayısal %s deÄŸeri beklenirken baÅŸlıkta boÅŸluklar bulundu" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1228,96 +1236,96 @@ msgstr "" "ediliyor" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "ArÅŸiv sekizlik deÄŸeri %.*s aralığın %s dışında" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "ArÅŸiv atıl base-64 baÅŸlıklar içeriyor" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "ArÅŸiv imzalı base-64 dizge %s, %s aralığının dışında" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "ArÅŸiv base-256 deÄŸeri %s aralığının dışında" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "ArÅŸiv %.*s içeriyor, halbuki orada sayısal %s deÄŸeri bekleniyor" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "ArÅŸiv deÄŸeri %s %s türünün %s..%s aralığının dışında" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " bağı -> %s \n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " bilinmeyen dosya türü %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--Uzun BaÄŸ--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--Uzun Ä°sim--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Bölüm BaÅŸlığı--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Devamı bayt %s de--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "OluÅŸturulan dizin:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "%s %s olarak deÄŸiÅŸtiriliyor\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Ä°smi %s olarak deÄŸiÅŸtirilemez" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "Gerisin geriye %s %s olarak deÄŸiÅŸtiriliyor\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Dosya okunamadan kaldırıldı" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "alt süreç" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "süreçlerarası kanal" @@ -1331,7 +1339,7 @@ msgstr "%s komutu baÅŸarısız" msgid "%s: file list requested from %s already read from %s" msgstr "%s: dosya listesi zaten okundu" -#: src/names.c:448 +#: src/names.c:448 src/checkpoint.c:274 #, fuzzy, c-format msgid "cannot split string '%s': %s" msgstr "zaman `%s' olarak ayarlanamaz" @@ -1341,11 +1349,11 @@ msgstr "zaman `%s' olarak ayarlanamaz" msgid "%s: file name read contains nul character" msgstr "%s: okunan dosya ismi boÅŸ karakter içeriyor" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "Kalıp eÅŸleme karakterleri dosya isimlerinde kullanılmış" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1353,48 +1361,48 @@ msgstr "" "Lütfen ya kalıp eÅŸlemeyi etkin kılmak için --wildcards ya da bu uyarıyı " "yoksaymak için --no-wildcards kullanın." -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: ArÅŸivde yok" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: ArÅŸivde bulunması gerekirken yok" -#: src/names.c:876 +#: src/names.c:879 #, c-format msgid "Archive label mismatch" msgstr "ArÅŸiv etiketi uyumsuzluÄŸu" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "Bir dosya listesi içerisinde --listed-incremental ile -C seçeneÄŸi kullanmaya " "izin verilmiyor" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "" "--listed-incremental seçeneÄŸi ile sadece bir -C seçeneÄŸi kullanılabilir" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "`-%s' ve `-%s' seçeneklerinin ikisi de standart girdi istiyor" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s: Geçersiz arÅŸiv biçimi" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "GNU özellikleri ile uyumsuz arÅŸiv biçimi" -#: src/tar.c:255 +#: src/tar.c:264 #, fuzzy, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." @@ -1402,7 +1410,7 @@ msgstr "" "Sarmalama ÅŸekli `%s' bilinmiyor. Listeyi almak için `%s --quoting-" "style=help' yazın." -#: src/tar.c:364 +#: src/tar.c:378 #, fuzzy msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " @@ -1422,7 +1430,7 @@ msgstr "" " tar -tvf arÅŸiv.tar # arÅŸiv.tar içindeki dosyalar listelenir\n" " tar -xf arÅŸiv.tar # arÅŸiv.tar'dan tüm dosyalar çıkarılır\n" -#: src/tar.c:373 +#: src/tar.c:387 #, fuzzy msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1444,79 +1452,79 @@ msgstr "" " nil, existing numaralıysa numaralı, deÄŸilse basit yedekleme yapılır\n" " never, simple daima basit yedekleme yapılır\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "Ana iÅŸlem kipi:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "bir arÅŸiv içeriÄŸini listeler" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "bir arÅŸivdeki dosyaları çıkarır" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "yeni bir arÅŸiv oluÅŸturur" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "arÅŸiv ile dosya sistemi arasındaki farklar bulunur" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "dosyaları arÅŸivin sonuna ekler" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "sadece arÅŸivdeki kopyasından daha yeni dosyalar eklenir" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "bir arÅŸive tar dosyaları ekler" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "arÅŸivden siler (teyplerde deÄŸil!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "arÅŸiv bölüm etiketini sınar ve çıkar" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "Ä°ÅŸlem deÄŸiÅŸtiriciler:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "seyrek dosyalar verimli ÅŸekilde elde edilir" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "ANA[.ALT]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "kullanılacak seyrek biçim sürümü ayarlanır (--sparse uygular)" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "GNU eski tarz arttırımlı yedekleme tanınır" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "GNU yeni tarz arttırımlı yedekleme tanınır" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "oluÅŸturulan listed-incremental arÅŸivi için döküm seviyesi" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "dosyalar okunamadığında sıfırdan farklı bir deÄŸerle çıkılmaz" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1528,131 +1536,139 @@ msgstr "" "ve dosyaların listelenmesi sırasında ya komut satırından ya da -T seçeneÄŸi " "üzerinden belirtilir. SAYI öntanımlı olaral 1'dir." -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "arÅŸiv arama yapılabilen türde" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "arÅŸiv aranabilir deÄŸil" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "artımlı arÅŸivler oluÅŸtururken aygıt numaralarını denetleme" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "artımlı arÅŸivler oluÅŸtururken aygıt numaralarını denetle (öntanımlı)" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "Ãœsteyazma denetimi:" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "yazdıktan sonra arÅŸivi doÄŸrulamaya çalışır" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "arÅŸive eklendikten sonra dosyalar silinir" -#: src/tar.c:471 +#: src/tar.c:485 #, fuzzy msgid "don't replace existing files when extracting, treat them as errors" msgstr "çıkarılırken mevcut dosyalar deÄŸiÅŸtirilmez" -#: src/tar.c:474 +#: src/tar.c:488 #, fuzzy msgid "don't replace existing files when extracting, silently skip over them" msgstr "çıkarılırken mevcut dosyalar deÄŸiÅŸtirilmez" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "arÅŸivdeki kopyalaraından daha yeni dosyalar deÄŸiÅŸtirilmez" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "çıkarılırken mevcut dosyaların üzerine yazılır" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "çıkarılmadan önce mevcut dosya silinir" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "dizin çıkarılmadan önce alt dizinleri silinir" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "mevcut dizinlerin öznitelikleri korunur" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "çıkarılırken mevcut dizinlerin metaverisinin üzerine yazılır (öntanımlı)" -#: src/tar.c:490 +#: src/tar.c:504 #, fuzzy msgid "preserve existing symlinks to directories when extracting" msgstr "çıkarılırken mevcut dosyaların üzerine yazılır" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "DÄ°ZÄ°N" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "Çıktı akımını seçiniz:" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "dosyalar standart çıktıya çıkarılır" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "KOMUT" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "çıkarılan dosyaları baÅŸka bir uygulamaya borular" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "altsüreçlerin çıkış kodları yoksayılır" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "altsüreçlerin çıkış kodları sıfırdan farklıysa hata olarak ele alınır" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Dosya özniteliklerinin elde edilmesi:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "Ä°SÄ°M eklenen dosyaların sahibi yapılır" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "Ä°SÄ°M eklenen dosyaların grubu yapılır" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "DOSYA-TARÄ°HÄ°" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "DOSYA-TARÄ°HÄ°nde eklenen dosyalar için mtime ayarlanır" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "KÄ°P" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "KÄ°P eklenen dosyaların (sembolik) kipi yapılır" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "YÖNTEM" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " @@ -1662,11 +1678,11 @@ msgstr "" "deÄŸerine getirerek (YÖNTEM='replace' öntanımlıdır) ya da ilk yerindeki " "zamanı deÄŸiÅŸtirmeyerek (YÖNTEM='system')." -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "dosya deÄŸiÅŸiklik zamanı çıkarılmaz" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" @@ -1674,21 +1690,21 @@ msgstr "" "dosyaları arÅŸivde bulunduÄŸu gibi aynı sahiplikle çıkarmayı deneyin (yetkili " "kullanıcı için öntanımlı)" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "" "dosyalar sizin sahipliÄŸinizde çıkarın (normal kullanıcılar için öntanımlı)" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "kullanıcı/grup isimleri yerine daima numaraları kullanılır" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" "dosya izinleri ile ilgili bilgileri çıkarır (root kullanıcısı için öntanımlı)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1696,16 +1712,16 @@ msgstr "" "arÅŸivden çıkarılırken izinlere kullanıcıların umask'ı uygulanır (sıradan " "kullanıcılar için öntanımlı)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "-p ve -s birlikte verilmiÅŸ gibi olur" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1713,180 +1729,188 @@ msgstr "" "herÅŸey çıkarılana kadar çıkarılan dizinlerin izinleri ve deÄŸiÅŸiklik " "zamanlarının deÄŸiÅŸtirilmesi geciktirilir" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "--delay-directory-restore seçeneÄŸinin etkisi iptal edilir." -#: src/tar.c:554 +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 #, fuzzy msgid "Handling of extended file attributes:" msgstr "Dosya özniteliklerinin elde edilmesi:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" msgstr "" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" msgstr "" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" msgstr "" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" msgstr "" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" msgstr "" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" msgstr "" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" msgstr "" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" msgstr "" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "Aygıt seçimi ve aygıt deÄŸiÅŸtirme:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ARŞİV" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "arÅŸiv dosyası ya da ARŞİV aygıtı kullanılır" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "bir iki nokta üstüste içerse bile arÅŸiv dosyası yereldir" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "rmt yerine rmt KOMUT kullanılır" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "rsh yerine uzak uçta KOMUT kullanılır" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "sürücü ve yoÄŸunluk belirtilir" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "çok bölümlü arÅŸivi oluÅŸturur/listeler/çıkarır" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "SAYI x 1024 bayt yazıldıktan sonra band deÄŸiÅŸtirilir" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "her bandın sonunda betiÄŸi çalıştırır (-M uygular)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "DOSYAda bölüm numarası kullanılır/güncellenir" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "Aygıtın blok düzeni:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "BLOK" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "kayıt başına BLOK x 512 bayt" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "512'nin katları olarak kayıt başına BOYUT bayt" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "arÅŸivdeki sıfırlı bloklar yoksayılır (dosyasonu anlamında)" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "okunmuÅŸ olarak yeniden bloklanır (4.2 BSD boruları için)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "ArÅŸiv biçimi seçimi:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "BİÇİM" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "belirtilen biçimin arÅŸivi oluÅŸturulur." -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "BİÇİM ÅŸunlardan biri olabilir:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "eski V7 tar biçimi" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "tar <= 1.12 için GNU biçimi" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x biçimi" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) biçimi" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) biçimi" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "pax ile aynı" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr " --format=v7 ile aynı" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "--format=posix ile aynı" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "isim[[:]=deÄŸer][,isim[[:]=deÄŸer]]..." -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "pax anahtar sözcüklerini denetler" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "METÄ°N" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1894,172 +1918,184 @@ msgstr "" "arÅŸivi METÄ°N bölüm ismiyle oluÅŸturur; listeleme/çıkarma sırasında METÄ°N, " "bölüm ismini genelleme kalıbı olarak kullanılır" -#: src/tar.c:660 +#: src/tar.c:684 msgid "Compression options:" msgstr "Sıkıştırma seçenekleri:" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "sıkıştırma programını bulmak için arÅŸiv sonekini kullan" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "sıkıştırma programını bulmak için arÅŸiv sonekini kullanma" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "UYG" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "arÅŸivi UYG üzerinden geçirir (UYG -d kabul etmeli)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "Yerel dosya seçimi:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" "belirtilen DOSYA arÅŸive eklenir (isim bir tire ile baÅŸlıyorsa kullanışlıdır)" -#: src/tar.c:687 -msgid "DIR" -msgstr "DÄ°ZÄ°N" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "DÄ°ZÄ°N dizinine geçilir" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "çıkarılacak ya da oluÅŸturulacak isimler DOSYAdan alınır" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "-T boÅŸ karakter sonlandırmalı isimleri okur, -C iptal edilir" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "önceki --null seçeneÄŸi etkisini devre dışı bırak" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" msgstr "-T ile okunan dosyaisimlerine tırnak ayıklama uygulanır" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" msgstr "-T ile okunan dosyaisimlerine tırnak ayıklama uygulanmaz" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "ÅžABLON" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "belirtilen ÅžABLONa uyan dosyalar hariç tutulur" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "DOSYAdaki ÅŸablonlara uyan isimler hariç tutulur" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "yafta dosyası hariç, CACHEDIR.TAG içeren dizinler dışlanır" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "CACHEDIR.TAG içeren dizinlerin altındaki herÅŸey hariç tutulur" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "CACHEDIR.TAG içeren dizinler hariç tutulur" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" "DOSYA'nın kendisi hariç, DOSYA içeren dizinlerin içerikleri hariç tutulur" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "DOSYA içeren dizinlerin altındaki herÅŸey hariç tutulur" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "DOSYA içeren dizinler hariç tutulur" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "sürüm denetimi sistem dizinlerini hariç tut" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "yedek ve kilit dosyalarını hariç tut" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "dizinlerde özdevinimli olarak azalan sıralamadan kaçınılır" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "arÅŸiv oluÅŸturulurken yerel dosya sisteminde kalınır" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "dizinlerin alt dizinlerine inilir (öntanımlı)" -#: src/tar.c:729 +#: src/tar.c:761 #, fuzzy msgid "don't strip leading '/'s from file names" msgstr "dosya isimlerinin başındaki `/'lar ayrılmaz" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "" "sembolik baÄŸlar izlenir; hedeflerindeki dosyalar arÅŸivlenir ve dökümlenir" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "" "sembolik baÄŸları izle; hedeflerindeki dosyaları arÅŸivle ve ÅŸuraya atıfta " "bulunan dosyaları dökümle" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "ÃœYE-Ä°SMÄ°" -#: src/tar.c:735 +#: src/tar.c:767 #, fuzzy msgid "begin at member MEMBER-NAME when reading the archive" msgstr "arÅŸivin ÃœYE-Ä°SMÄ° üyesinden baÅŸlanır" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "sadece DOSYA-TARÄ°HÄ°nden daha yeni dosyalar saklanır" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "TARÄ°H" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "sadece veri deÄŸiÅŸecekse tarih ve saat karşılaÅŸtırılır" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "DENETÄ°M" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "kaldırılmadan önce DENETÄ°M sürümü seçilerek yedeklenir" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "DÄ°ZGE" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -2067,100 +2103,100 @@ msgstr "" "kaldırmadan önce uygun sonekle yedekleme yapılır (SIMPLE_BACKUP_SUFFIX ortam " "deÄŸiÅŸkeni ile belirlenmemiÅŸse sonek olarak '~' kullanılır" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "Dosya ismi dönüşümleri:" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "çıkarılırken dosya isimlerinden baÅŸtaki SAYI bileÅŸen ayrılır" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "Ä°FADE" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "dosya isimleri dönüştürülürken sed deÄŸiÅŸtirme Ä°FADEsi kullanılır" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "Dosya ismi eÅŸleÅŸtirme seçenekleri\n" "(içerme ve dışlama kalıplarının her ikisi de etkili):" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "harf büyüklükleri önemsenmez" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "dosya isminin baÅŸlangıcına uyan kalıplar" -#: src/tar.c:767 +#: src/tar.c:799 #, fuzzy msgid "patterns match after any '/' (default for exclusion)" msgstr "bir /'dan sonra ÅŸablonla eÅŸleÅŸen kalıplar (dışlama için öntanımlı)" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "harf büyüklüklerine duyarlı eÅŸleÅŸme (öntanımlı)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "genelleme kalıpları kullanılır (dışlama için öntanımlı)" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "birebir dizge eÅŸleme" -#: src/tar.c:775 +#: src/tar.c:807 #, fuzzy msgid "wildcards do not match '/'" msgstr "'/' ile eÅŸleÅŸmeyen genelleme kalıpları" -#: src/tar.c:777 +#: src/tar.c:809 #, fuzzy msgid "wildcards match '/' (default for exclusion)" msgstr "'/' ile eÅŸleÅŸen genelleme kalıpları (dışlama için öntanımlı)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Bilgilendirme çıktısı:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "iÅŸlenen dosyalar ayrıntılı listelenir" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "ANAHTAR SÖZCÃœK" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "uyarı denetimi" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "her SAYIncı kayıtta geliÅŸim iletisi gösterilir (öntanımlı: 10)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "Ä°ÅžLEM" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "her kontrol noktasında Ä°ÅžLEM çalıştır" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "tüm baÄŸlar dökümlenmezse bir ileti basılır" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "SiNYAL" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2171,80 +2207,80 @@ msgstr "" "alındığında bayt toplamını basar; Ä°zin verilen sinyaller: SIGHUP, SIGQUIT, " "SIGINT, SIGUSR1 ve SIGUSR2; SIG ile baÅŸlamayanları da kabul edilir" -#: src/tar.c:802 +#: src/tar.c:834 msgid "print file modification times in UTC" msgstr "dosya deÄŸiÅŸiklik zamanlarını UTC'ye göre bas" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "tüm çözünürlüğü kullanarak dosya zamanını bas" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "ayrıntılı çıktı DOSYAya gönderilir" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "her iletide arÅŸiv içindeki blok sayısı gösterilir" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "her eylemden önce doÄŸrulama istenir" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "tar öntanımlıları gösterilir" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" "listeleme ya da çıkarma sırasında arama koÅŸuluna uymayan dizinler listelenir" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "dönüşümden sonra dosya ve arÅŸiv isimlerini gösterir" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "ÅžEKÄ°L" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "sarmalama ÅŸeklinin ismi; geçerli ÅžEKÄ°L deÄŸerleri için aÅŸağıya bakınız" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "DÄ°ZGEdeki sarmalama karakterlerine ek olarak" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "DÄ°ZGEdeki karakterler için sarmalamayı iptal eder" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "Uyumluluk seçenekleri:" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "oluÅŸtururken --old-archive ile, çıkarırken --no-same-owner ile aynı" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "DiÄŸer seçenekler:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "bozuculuk olasılığı olan bazı seçeneklerin kullanımı iptal edilir" -#: src/tar.c:978 +#: src/tar.c:1010 #, fuzzy msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " @@ -2253,40 +2289,40 @@ msgstr "" "Aynı anda `-Acdtrux' veya `--test-label' seçeneklerinin sadece birini " "kullanabilirsiniz" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Sıkıştırma seçenekleri çeliÅŸiyor" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "Bilinmeyen sinyal ismi: %s" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "Tarih örnekleri dosyası bulunamadı" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Bilinmeyen tarih biçemi %2$s yerine %1$s kullanılıyor" -#: src/tar.c:1108 +#: src/tar.c:1140 #, fuzzy, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "Seçenek %s: `%s' tarihi %s olarak ele alınıyor" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "arÅŸivi %s üzerinden filtrele" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "--quoting-style seçeneÄŸi için geçerli argümanlar:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2294,48 +2330,48 @@ msgstr "" "\n" "*Bu* tar için öntanımlılar:\n" -#: src/tar.c:1295 +#: src/tar.c:1330 #, fuzzy msgid "Invalid owner or group ID" msgstr "Sahip geçersiz" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Bloklama çarpanı geçersiz" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "Kayıt ortamının uzunluÄŸu geçersiz" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "Geçersiz arttırımlı seviye deÄŸeri" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "Birden fazla eÅŸik tarihi" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "Seyrek sürüm deÄŸeri geçersiz" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' seçeneÄŸi bu platformda desteklenmiyor" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "--checkpoint deÄŸeri bir tamsayı deÄŸil" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Seçenekte verilen kip geçersiz" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "Sayı geçersiz" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" @@ -2343,139 +2379,129 @@ msgstr "" "--preserve seçeneÄŸi kullanılmıyor, yerine --preserve-permissions --preserve-" "order kullanın" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Kayıt uzunluÄŸu geçersiz" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "Kayıt uzunluÄŸu %d nin katları olmalı" -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "Elemen sayısı geçersiz" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "Sadece tek bir --to-command seçeneÄŸi kullanılabilir" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "Hatalı yoÄŸunluk argümanı: %s" -#: src/tar.c:2133 +#: src/tar.c:2205 #, fuzzy, c-format msgid "Unknown density: '%c'" msgstr "Bilinmeyen yoÄŸunluk: '%c'" -#: src/tar.c:2150 +#: src/tar.c:2222 #, fuzzy, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "`-[0-7][lmh]' seçeneÄŸi *bu* tar ile desteklenmiyor" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[DOSYA]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 +#, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "%s ÅŸablonu kullanılamıyor" + +#: src/tar.c:2389 #, fuzzy, c-format msgid "Old option '%c' requires an argument." msgstr "Eski seçenek `%c' bir argümanla kullanılır." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "--occurrence bir dosya listesi olmaksızın anlamlı deÄŸil" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "--occurrence istenen iÅŸlem kipinde kullanılamaz" - -#: src/tar.c:2408 +#: src/tar.c:2490 #, fuzzy msgid "Multiple archive files require '-M' option" msgstr "Çok sayıda arÅŸiv dosyası `-M' seçeneÄŸi gerektirir" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "--listed-incremental ile --newer birlikte kullanılamaz" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "--listed-incremental olmadan --level anlamsızdır" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "%s: Bölüm etiketi çok uzun (sınır: %lu bayt)" msgstr[1] "%s: Bölüm etiketi çok uzun (sınır: %lu bayt)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Çok sayıda bölüm içeren arÅŸivler doÄŸrulanamaz" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Sıkıştırılmış arÅŸivler doÄŸrulanamaz" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "%s ÅŸablonu kullanılamıyor" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Çok sayıda bölüm içeren sıkıştırılmış arÅŸivler kullanılamıyor" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "Sıkıştırılmış arÅŸivler birleÅŸtirilemez" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option sadece POSIX arÅŸivlerinde kullanılabilir" -#: src/tar.c:2478 +#: src/tar.c:2560 #, fuzzy msgid "--acls can be used only on POSIX archives" msgstr "--pax-option sadece POSIX arÅŸivlerinde kullanılabilir" -#: src/tar.c:2483 +#: src/tar.c:2565 #, fuzzy msgid "--selinux can be used only on POSIX archives" msgstr "--pax-option sadece POSIX arÅŸivlerinde kullanılabilir" -#: src/tar.c:2488 +#: src/tar.c:2570 #, fuzzy msgid "--xattrs can be used only on POSIX archives" msgstr "--pax-option sadece POSIX arÅŸivlerinde kullanılabilir" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "%s ÅŸablonu kullanılamıyor" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" +msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "Hacim uzunluÄŸu kayıt boyutundan daha az olamaz" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "--preserve-order, --listed-incremental ile uyumlu deÄŸil" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "Bir boÅŸ arÅŸivin oluÅŸturulması ister istemez reddediliyor" -#: src/tar.c:2565 +#: src/tar.c:2669 #, fuzzy msgid "Options '-Aru' are incompatible with '-f -'" msgstr "`-Aru' seçenekleri `-f -' ile uyumsuz" -#: src/tar.c:2660 +#: src/tar.c:2766 #, fuzzy msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" @@ -2483,11 +2509,15 @@ msgstr "" "Aynı anda `-Acdtrux' veya `--test-label' seçeneklerinin sadece birini " "kullanmalısınız" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "Önceki hatalar nedeniyle baÅŸarısız durumla çıkılıyor" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" @@ -2495,98 +2525,98 @@ msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: Dosya %s baytta kırpılmış" msgstr[1] "%s: Dosya %s baytta kırpılmış" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "%s anahtar sözcüğü ya bilinmiyor ya da henüz gerçeklenmemiÅŸ" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" msgstr "Zaman damgası izin verilen aralığın dışında" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "%s ÅŸablonu kullanılamıyor" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "%s anahtar sözcüğü çakıştırılamaz" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "Ek baÅŸlık bozuk: uzunluk eksik" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "Ek baÅŸlık uzunluÄŸu %*s aralık dışında" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "Ek baÅŸlık bozuk: uzunluktan sonra boÅŸluk yok" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "Ek baÅŸlık bozuk: eÅŸit iÅŸareti eksik" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "Ek baÅŸlık bozuk: satırsonu eksik" -#: src/xheader.c:740 +#: src/xheader.c:741 #, fuzzy, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "Bilinmeyen ek baÅŸlık anahtar sözcüğü `%s' yoksayılıyor" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "Ãœretilen isim/deÄŸer çifti çok uzun (isim=%s, uzunluk=%s)" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "Ek baÅŸlık %s=%s, %s..%s aralığının dışında" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Ek baÅŸlık bozuk: %s=%s geçersiz" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Ek baÅŸlık bozuk: %s=%s aşırıya kaçmış" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "Ek baÅŸlık bozuk: %s geçersiz: umulmadık %c ayracı" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "Ek baÅŸlık bozuk: %s geçersiz: deÄŸerler tek sayıda" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "%s: geçerli bir zaman çıktısı deÄŸil" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "%s: bilinmeyen kontrol noktası iÅŸlemi" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "yazma" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "okuma" @@ -2594,7 +2624,7 @@ msgstr "okuma" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "Yazma sınama yeri %u" @@ -2603,7 +2633,7 @@ msgstr "Yazma sınama yeri %u" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "Okuma sınaması yeri %u" @@ -2861,12 +2891,19 @@ msgstr "Komut sonlandı\n" msgid "--stat requires file names" msgstr "--stat seçeneÄŸi dosya isimleri gerektirir" -#~ msgid "Cannot get working directory" -#~ msgstr "Çalışma dizini alınamıyor" - #~ msgid "sort names to extract to match archive" #~ msgstr "isimler arÅŸivdeki sırasına göre çıkarılır" +#, fuzzy +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "--occurrence istenen iÅŸlem kipinde kullanılamaz" + +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "--listed-incremental ile --newer birlikte kullanılamaz" + +#~ msgid "--preserve-order is not compatible with --listed-incremental" +#~ msgstr "--preserve-order, --listed-incremental ile uyumlu deÄŸil" + #~ msgid "Field too long while reading snapshot file" #~ msgstr "Anlık görüntü dosyası okunurken alan çok uzun" @@ -2876,6 +2913,9 @@ msgstr "--stat seçeneÄŸi dosya isimleri gerektirir" #~ msgid "Unexpected field value in snapshot file" #~ msgstr "Anlık görüntü dosyasında beklenmeyen alan deÄŸeri" +#~ msgid "Cannot get working directory" +#~ msgstr "Çalışma dizini alınamıyor" + #~ msgid "Invalid group" #~ msgstr "Geçersiz grup" diff --git a/po/uk.gmo b/po/uk.gmo index a198bae..a67beab 100644 Binary files a/po/uk.gmo and b/po/uk.gmo differ diff --git a/po/uk.po b/po/uk.po index 3f4fe33..1a69676 100644 --- a/po/uk.po +++ b/po/uk.po @@ -3,12 +3,12 @@ # Copyright (C) 2010 Free Software Foundation, Inc. # Sergey Poznyakoff , 2005, 2006, 2007, 2008, 2009, 2010. # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" "Project-Id-Version: tar 1.24\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" "PO-Revision-Date: 2010-10-25 15:22+0300\n" "Last-Translator: Sergey Poznyakoff \n" "Language-Team: Ukrainian \n" @@ -100,7 +100,7 @@ msgstr "вивеÑти цю довідку" msgid "give a short usage message" msgstr "вивеÑти коротке Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾ викориÑтаннÑ" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "ÐÐЗВÐ" @@ -436,7 +436,7 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: Помилка у функції %s" @@ -445,27 +445,27 @@ msgstr "%s: Помилка у функції %s" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: ПопередженнÑ: Помилка у функції %s" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s: Ðе вдаєтьÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ права доÑтупу на %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: Ðе вдаєтьÑÑ Ð·Ð¼Ñ–Ð½Ð¸Ñ‚Ð¸ влаÑника на uid %lu, gid %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: Ðе вдаєтьÑÑ Ñтворити жорÑтке поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° %s" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" @@ -473,7 +473,7 @@ msgstr[0] "%s: Помилка в позиції %s, під Ñ‡Ð°Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ msgstr[1] "%s: Помилка в позиції %s, під Ñ‡Ð°Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ %lu байтів" msgstr[2] "%s: Помилка в позиції %s, під Ñ‡Ð°Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ %lu байтів" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" @@ -481,22 +481,22 @@ msgstr[0] "%s: ПопередженнÑ: Помилка в позиції %s, п msgstr[1] "%s: ПопередженнÑ: Помилка в позиції %s, під Ñ‡Ð°Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ %lu байтів" msgstr[2] "%s: ПопередженнÑ: Помилка в позиції %s, під Ñ‡Ð°Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ %lu байтів" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s: Ðе вдаєтьÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ lseek до %s" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s: ПопередженнÑ: Ðе вдаєтьÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ lseek до %s" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: Ðе вдаєтьÑÑ Ñтворити Ñимволічне поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° %s" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -596,8 +596,8 @@ msgstr "Ðеочікувані аргументи" msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "Керує Ñтрічковим приÑтроєм, отримуючи команди від віддаленого процеÑу" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "ЧИСЛО" @@ -605,10 +605,10 @@ msgstr "ЧИСЛО" msgid "set debug level" msgstr "вÑтановити рівень налагоджуваннÑ" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "ФÐЙЛ" @@ -630,59 +630,67 @@ msgstr "забагато аргументів" msgid "Garbage command" msgstr "Хибна команда" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Це не Ñхоже на архів tar" -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" -msgstr "ЗапиÑано загалом" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" msgstr "Прочитано байтів загалом" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "ЗапиÑано загалом" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Видалено загалом: %s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(канал)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "ÐедійÑне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ record_size" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Ðе вказано назви архіву" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Ðеможливо перевірÑти архів, запиÑаний до stdout" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Ðрхів ÑтиÑнений. ВикориÑтовуйте опцію %s" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Ðе можна оновлювати ÑтиÑнені архіви" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "Ðа початку Ñтрічки, закінчуємо" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "Ðадто багато помилок, Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Ð¿ÐµÑ€ÐµÑ€Ð²Ð°Ð½Ð¾" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" @@ -690,7 +698,7 @@ msgstr[0] "Розмір запиÑу = %lu блок" msgstr[1] "Розмір запиÑу = %lu блоки" msgstr[2] "Розмір запиÑу = %lu блоків" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" @@ -698,39 +706,39 @@ msgstr[0] "Ðевірне Ð²Ð¸Ñ€Ñ–Ð²Ð½ÑŽÐ²Ð°Ð½Ð½Ñ Ð±Ð»Ð¾ÐºÑƒ (%lu байт) в msgstr[1] "Ðевірне Ð²Ð¸Ñ€Ñ–Ð²Ð½ÑŽÐ²Ð°Ð½Ð½Ñ Ð±Ð»Ð¾ÐºÑƒ (%lu байти) в архіві" msgstr[2] "Ðевірне Ð²Ð¸Ñ€Ñ–Ð²Ð½ÑŽÐ²Ð°Ð½Ð½Ñ Ð±Ð»Ð¾ÐºÑƒ (%lu байтів) в архіві" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" "Ðе вдалоÑÑ Ð¿ÐµÑ€ÐµÐ¼Ñ–ÑтитиÑÑŒ назад у архіві; можливо архів не можна прочитати " "без опції -i" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek не зупинивÑÑ Ð½Ð° межі запиÑу" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: міÑтить невірний номер тому" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "ÐŸÐµÑ€ÐµÐ¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ð½Ð¾Ð¼ÐµÑ€Ð° тому" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Підготуйте том #%d архіву %s Ñ— натиÑнить return: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "Кінець файлу, заміÑÑ‚ÑŒ очікуваної відповіді" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "ПОПЕРЕДЖЕÐÐЯ: Ðезавершений архів" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -741,66 +749,66 @@ msgstr "" " q Перервати роботу\n" " у або новий Ñ€Ñдок Продовжувати\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! Викликати оболонку\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? ВивеÑти цю довідку\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Ðовий том відÑутній. ЗавершеннÑ.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "Ðе вказано назви файлу. Спробуйте ще раз.\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "ÐедійÑні вхідні дані. Ðаберіть ? щоб отримати підказку.\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "збій Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ `%s'" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "" "%s можливо продовжуєтьÑÑ Ñƒ цьому томі: заголовок міÑтить обрізану назву" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s не продовжуєтьÑÑ Ñƒ цьому томі" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s Ñ” неправильним розміром (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Цей том Ñ” за межами поÑлідовноÑÑ‚Ñ– (%s - %s != %s)" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "Ðазви тому відÑÑƒÑ‚Ð½Ñ Ð² архіві. Ðе можна порівнÑти з %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "Етикетка тому %s не Ñпівпадає з %s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -808,7 +816,7 @@ msgstr "" "%s: назва файлу надто довга щоб зберегти Ñ—Ñ— у заголовку тому GNU; назву " "обрізано" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "Ð·Ð°Ð¿Ð¸Ñ Ð½Ðµ закінчивÑÑ Ð½Ð° межі блоку" @@ -820,16 +828,16 @@ msgstr[0] "ВдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ тільки %lu з %lu байта" msgstr[1] "ВдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ тільки %lu з %lu байтів" msgstr[2] "ВдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ тільки %lu з %lu байтів" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "Ð Ñ–Ð·Ð½Ð¸Ñ†Ñ Ñƒ зміÑÑ‚Ñ–" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "Ðеочікуваний кінець файла в архіві" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "Ð Ñ–Ð·Ð½Ð¸Ñ†Ñ Ñƒ типі файлу" @@ -849,7 +857,7 @@ msgstr "Ð Ñ–Ð·Ð½Ð¸Ñ†Ñ Ñƒ значенні GID" msgid "Mod time differs" msgstr "Ð Ñ–Ð·Ð½Ð¸Ñ†Ñ Ñƒ чаÑÑ– модифікації" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Ð Ñ–Ð·Ð½Ð¸Ñ†Ñ Ñƒ розмірі" @@ -866,31 +874,31 @@ msgstr "Ð Ñ–Ð·Ð½Ð¸Ñ†Ñ Ñƒ Ñимволічному поÑиланні" msgid "Device number differs" msgstr "Ð Ñ–Ð·Ð½Ð¸Ñ†Ñ Ñƒ номері приÑтрою" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Перевірка " -#: src/compare.c:471 +#: src/compare.c:473 #, fuzzy, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "%s: Ðевідомий тип файлу `%c', перевірюєтьÑÑ Ñк звичайний файл" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "Ðрхів міÑтить назви файлів без попереджуючих префікÑів." # FIXME: base=64? -#: src/compare.c:533 +#: src/compare.c:535 #, fuzzy msgid "Archive contains transformed file names." msgstr "Ðрхів міÑтить заÑтарілі заголовки з оÑновою 64" -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "Перевірка може не знайти первинних файлів." -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" @@ -898,7 +906,7 @@ msgstr[0] "ПОМИЛКРПЕРЕВІРКИ: знайдено %d невірни msgstr[1] "ПОМИЛКРПЕРЕВІРКИ: знайдено %d невірних заголовки" msgstr[2] "ПОМИЛКРПЕРЕВІРКИ: знайдено %d невірних заголовків" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "Самотній блок нулів, зÑув %s" @@ -946,56 +954,56 @@ msgstr[0] "%s: Файл ÑкоротивÑÑ Ð½Ð° %s байт; заповнен msgstr[1] "%s: Файл ÑкоротивÑÑ Ð½Ð° %s байти; Ð·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ð½ÑƒÐ»Ñми" msgstr[2] "%s: Файл ÑкоротивÑÑ Ð½Ð° %s байтів; Ð·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ð½ÑƒÐ»Ñми" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: файл знаходитьÑÑ Ð² іншої файлової ÑиÑтемі; не архівуєтьÑÑ" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "вміÑÑ‚ не архівуєтьÑÑ" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s: Ðевідомий тип файла; Файл проігноровано" -#: src/create.c:1549 +#: src/create.c:1551 #, c-format msgid "Missing links to %s." msgstr "ВідÑутні деÑкі поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð¾ %s." -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: файл не змінено; не архівуєтьÑÑ" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: файл Ñ” архівом; не архівуєтьÑÑ" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "каталог не архівуєтьÑÑ" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: файл змінивÑÑ Ð¿Ñ–Ð´ Ñ‡Ð°Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: гніздо ігноруєтьÑÑ" # FIXME: door? -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: двері ігноруютьÑÑ" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Перехід до наÑтупного заголовка" @@ -1041,7 +1049,7 @@ msgstr "Спроба перетворити Ñимволічні поÑилан msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s: Ðе вдаєтьÑÑ Ð²Ð¸Ñ‚Ñгнути -- файл починаєтьÑÑ Ð² іншому томі" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" msgstr "Ðеочікуваний кінець файла у заголовку довгої назви" @@ -1086,157 +1094,157 @@ msgstr "%s: файл знаходитьÑÑ Ð² іншої файлової Ñи msgid "%s: Directory has been renamed" msgstr "%s: Каталог перейменовано" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "Ðевірний Ñ‡Ð°Ñ Ñ„Ð°Ð¹Ð»Ñƒ" -#: src/incremen.c:1045 +#: src/incremen.c:1047 #, fuzzy msgid "Invalid modification time" msgstr "Ðевірна дата модифікації (Ñекунди)" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "ÐедійÑний Ñ‡Ð°Ñ Ð¼Ð¾Ð´Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ— (наноÑекунди)" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "Ðевірний номер приÑтрою" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Ðевірний номер Ñ–-вузла" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" msgstr "" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" msgstr "Ðеочікуваний кінець файла-знімка" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" msgstr "" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" msgstr "" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "Бракує ознаки ÐºÑ–Ð½Ñ†Ñ Ð·Ð°Ð¿Ð¸Ñу" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "Ðеправильний формат файла знімку" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "Такий інкрементний формат не підтримуєтьÑÑ: %" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "" "Ðеправильно Ñформований dumpdir: очікувалоÑÑ '%c' натоміÑÑ‚ÑŒ знайдено %#3o" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "Ðеправильно Ñформований dumpdir: 'X' вказаний двічі" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "Ðевірний формат dumpdir: пуÑта назва у `R'" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "Ðевірний формат dumpdir: `T' без попереднього `R'" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "Ðевірний формат dumpdir: пуÑта назва у `T'" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "" "Ðевірний формат dumpdir: очікувалоÑÑ `%c', натоміÑÑ‚ÑŒ знайдено кінець файла" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "Ðевірний формат dumpdir: `X' не викориÑтаний" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Ðе вдаєтьÑÑ Ñтворити тимчаÑовий каталог викориÑтовуючи шаблон %s" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Каталог не очищуєтьÑÑ: не вдалоÑÑ Ð²Ð¸ÐºÐ¾Ð½Ð°Ñ‚Ð¸ stat" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: Каталог знаходитьÑÑ Ð½Ð° іншому приÑтрої: не очищуєтьÑÑ" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Ð¡Ñ‚Ð¸Ñ€Ð°Ð½Ð½Ñ %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: Ðе вдаєтьÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸Ñ‚Ð¸" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: ПропуÑкаєтьÑÑ" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "блок %s: ** МіÑтить нулі **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "блок %s: ** Кінець файлу **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "блок %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "Пробіли у заголовку заміÑÑ‚ÑŒ очікуваного чиÑлового Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ‚Ð¸Ð¿Ñƒ %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" @@ -1244,17 +1252,17 @@ msgstr "" "вважаєтьÑÑ, що це Ñ” двійкове доповненнÑ" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Ð’Ñ–Ñімкове Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ %.*s знаходитьÑÑ Ð¿Ð¾Ð·Ð° межами діапазону типу %s" # FIXME: base=64? -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "Ðрхів міÑтить заÑтарілі заголовки з оÑновою 64" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "" @@ -1262,82 +1270,82 @@ msgstr "" "типу %s" # FIXME: base-256 -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð· оÑновою 256 поза допуÑтимими межами типу %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "Знайдено %.*s заміÑÑ‚ÑŒ чиÑлового Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ‚Ð¸Ð¿Ñƒ %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ %s поза допуÑтимими межами типу %s %s..%s" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr "поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð´Ð¾ %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr "невідомий тип файла %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--Довге поÑиланнÑ--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--Довга назва--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Заголовок тому--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--ПродовжуєтьÑÑ Ð· байту %s--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ñƒ:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "Перейменовано %s у %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Ðе вдаєтьÑÑ Ð¿ÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ñ‚Ð¸ на %s" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "Перейменовано %s назад у %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Файл було видалено перед тим Ñк tar вÑтиг його прочитати" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "процеÑ-нащадок" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "канал між процеÑами" @@ -1351,7 +1359,7 @@ msgstr "збій Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ `%s'" msgid "%s: file list requested from %s already read from %s" msgstr "%s: перелік файлів уже прочитано" -#: src/names.c:448 +#: src/names.c:448 src/checkpoint.c:274 #, fuzzy, c-format msgid "cannot split string '%s': %s" msgstr "не вдаєтьÑÑ Ð²Ñтановити Ñ‡Ð°Ñ Ñ„Ð°Ð¹Ð»Ð° `%s'" @@ -1361,11 +1369,11 @@ msgstr "не вдаєтьÑÑ Ð²Ñтановити Ñ‡Ð°Ñ Ñ„Ð°Ð¹Ð»Ð° `%s'" msgid "%s: file name read contains nul character" msgstr "%s: прочитана назва файла міÑтить нульовий Ñимвол" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "Ðазви файлів міÑÑ‚ÑÑ‚ÑŒ Ñимволи-шаблони" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" @@ -1373,47 +1381,47 @@ msgstr "" "КориÑтайтеÑÑ Ð¾Ð¿Ñ†Ñ–Ñ”ÑŽ --wildcards аби увімкнути шаблони, або опцією --no-" "wildcards, щоб позбутиÑÑ Ñ†ÑŒÐ¾Ð³Ð¾ повідомленнÑ" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: Ðе знайдено в архіві" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Потрібну копію у архіві не знайдено" -#: src/names.c:876 +#: src/names.c:879 #, c-format msgid "Archive label mismatch" msgstr "ÐезгідніÑÑ‚ÑŒ назви тому" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" "ВикориÑÑ‚Ð°Ð½Ð½Ñ Ð¾Ð¿Ñ†Ñ–Ñ— -C у переліку файлів разом з опцією --listed-incremental " "не дозволÑєтьÑÑ" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "Разом з --listed-incremental дозволÑєтьÑÑ Ð»Ð¸ÑˆÐµ одна Ð¾Ð¿Ñ†Ñ–Ñ -C" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "Обидві опції -%s Ñ– -%s вимагають доÑтупу до Ñтандартного входу" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s: Ðевірний формат архіву" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "Формат архіву Ñ” неÑуміÑним з розширеними влаÑтивоÑÑ‚Ñми GNU" -#: src/tar.c:255 +#: src/tar.c:264 #, fuzzy, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." @@ -1421,7 +1429,7 @@ msgstr "" "Ðевідомий Ñтиль Ñ†Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ `%s'. Ðаберіть `%s --quoting-style=help' аби " "отримати перелік Ñтилів." -#: src/tar.c:364 +#: src/tar.c:378 #, fuzzy msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " @@ -1441,7 +1449,7 @@ msgstr "" " # archive.tar\n" " tar -xf archive.tar # ВитÑгує уÑÑ– файли з archive.tar.\n" -#: src/tar.c:373 +#: src/tar.c:387 #, fuzzy msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1464,81 +1472,81 @@ msgstr "" " інакше - проÑÑ‚Ñ–\n" " never, simple завжди Ñтворювати проÑÑ‚Ñ– резервні копії\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "Режими роботи:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "вивеÑти вміÑÑ‚ архіву" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "витÑгнути файли з архіву" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "Ñтворити новий архів" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "порівнÑти файли в архіві з файлами у файлової ÑиÑтемі" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "долучити файли до Ñ–Ñнуючого архіву" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "долучати тільки такі файли, що Ñ” новішими за Ñ—Ñ… копії в архіві" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "долучити архів до архіву" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "видалити файли з архіву (не на Ñтрічці!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "перевірити мітку тому та вийти" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "Модифікатори режиму роботи:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "заощаджувати проÑÑ‚Ñ–Ñ€ під Ñ‡Ð°Ñ Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ñ€Ð¾Ð·ÑÑ–Ñних файлів" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "ГОЛОВÐИЙ[.ДРУГОРЯДÐИЙ]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "вÑтановлює верÑÑ–ÑŽ формату розÑÑ–Ñних файлів (вмикає --sparse)" # FIXME: incremental -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "обробка Ñтарого формату інкрементного архіву GNU" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "обробка нового формату інкрементного архіву GNU" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "рівень архівної копії Ð´Ð»Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñ–Ð½ÐºÑ€ÐµÐ¼ÐµÐ½Ñ‚Ð½Ð¾Ð³Ð¾ архіву" # FIXME: хммм... -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "ігнорувати помилки Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð²" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1550,133 +1558,141 @@ msgstr "" "з переліком файлів (у командному Ñ€Ñдку або за допомогою опції -T). Типове " "ЧИСЛО: 1." -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "архів підтримує операцію seek" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "архів не підтримує операцію seek" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "не перевірÑти номери приÑтрою під Ñ‡Ð°Ñ ÑÑ‚Ð²Ð¾Ñ€ÑŽÐ²Ð°Ð½Ð½Ñ Ñ–Ð½ÐºÑ€ÐµÐ¼ÐµÐ½Ñ‚Ð½Ð¸Ñ… архівів" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "" "перевірÑти номери приÑтрою під Ñ‡Ð°Ñ ÑÑ‚Ð²Ð¾Ñ€ÑŽÐ²Ð°Ð½Ð½Ñ Ñ–Ð½ÐºÑ€ÐµÐ¼ÐµÐ½Ñ‚Ð½Ð¸Ñ… архівів (типово)" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿Ð¸Ñом:" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "перевірити архів піÑÐ»Ñ Ð·Ð°Ð¿Ð¸Ñу в нього" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "видалÑти файли піÑÐ»Ñ Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð´Ð¾ архіву" -#: src/tar.c:471 +#: src/tar.c:485 #, fuzzy msgid "don't replace existing files when extracting, treat them as errors" msgstr "не замінÑти Ñ–Ñнуючи файли під Ñ‡Ð°Ñ Ð²Ð¸Ñ‚ÑгуваннÑ" -#: src/tar.c:474 +#: src/tar.c:488 #, fuzzy msgid "don't replace existing files when extracting, silently skip over them" msgstr "не замінÑти Ñ–Ñнуючи файли під Ñ‡Ð°Ñ Ð²Ð¸Ñ‚ÑгуваннÑ" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "не замінÑти Ñ–Ñнуючи файли що Ñ” новішими за Ñ—Ñ… копії у архіві" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "перезапиÑувати Ñ–Ñнуючі файли під Ñ‡Ð°Ñ Ð²Ð¸Ñ‚ÑгуваннÑ" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "видалÑти кожний файл перед витÑгуваннÑм його копії" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "ÑпорожнÑти Ñтарий каталог перед витÑгуваннÑм його копії з архіву" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "зберігати мета-дані Ñ–Ñнуючих каталогів" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" "перезапиÑувати метадані Ñ–Ñнуючих каталогів під Ñ‡Ð°Ñ Ð²Ð¸Ñ‚ÑÐ³ÑƒÐ²Ð°Ð½Ð½Ñ (типово)" -#: src/tar.c:490 +#: src/tar.c:504 #, fuzzy msgid "preserve existing symlinks to directories when extracting" msgstr "перезапиÑувати Ñ–Ñнуючі файли під Ñ‡Ð°Ñ Ð²Ð¸Ñ‚ÑгуваннÑ" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "КÐТÐЛОГ" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "Вибір вихідного потоку:" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "витÑгувати файли у Ñтандартний вивід" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "КОМÐÐДÐ" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "передавати витÑгнуті файли до Ñтандартного вводу іншої програми" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "ігнорувати коди Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð¿Ñ€Ð¾Ñ†ÐµÑів-нащадків" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "вважати ненульовий код Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð½Ð°Ñ‰Ð°Ð´ÐºÐ° помилкою" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Обробка атрибутів файлу:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²ÐºÐ°Ð·Ð°Ð½Ð¾Ð³Ð¾ кориÑтувача влаÑником доданих файлів" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð³Ñ€ÑƒÐ¿Ð¸ з вказаною назвою групою влаÑника доданих файлів" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "ДÐТÐ-ÐБО-ФÐЙЛ" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ‡Ð°Ñу оÑтанньої зміни доданих файлів" # Ðу, Ñ– чому це CHANGES?? -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "ПРÐÐ’Ð" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð²ÐºÐ°Ð·Ð°Ð½Ð¸Ñ… Ñимволічно прав доÑтупу Ð´Ð»Ñ Ð´Ð¾Ð´Ð°Ð½Ð¸Ñ… файлів" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "МЕТОД" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " @@ -1686,11 +1702,11 @@ msgstr "" "Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ (типово, МЕТОД='replace'), або через Ð·Ð°Ð¿Ð¾Ð±Ñ–Ð³Ð°Ð½Ð½Ñ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑŽ чаÑу " "(МЕТОД='system')" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "не витÑгувати Ñ‡Ð°Ñ Ð¼Ð¾Ð´Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ— файлів" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" @@ -1698,21 +1714,21 @@ msgstr "" "вÑтановлювати влаÑників файлів за даними з архіву (типово Ð´Ð»Ñ Ñупер-" "кориÑтувача)" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "Ñтати влаÑником витÑгнутих файлів (типово Ð´Ð»Ñ Ð·Ð²Ð¸Ñ‡Ð°Ð¹Ð½Ð¾Ð³Ð¾ кориÑтувача)" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "завжди викориÑтовувати чиÑла заміÑÑ‚ÑŒ назв влаÑника/групи" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" "вÑтановлювати права доÑтупу згідно з даними архіву (типово Ð´Ð»Ñ Ñупер-" "кориÑтувача)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" @@ -1720,16 +1736,16 @@ msgstr "" "вÑтановлювати права доÑтупу згідно зі значеннÑм umask (типово Ð´Ð»Ñ Ð·Ð²Ð¸Ñ‡Ð°Ð¹Ð½Ð¾Ð³Ð¾ " "кориÑтувача)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "те ж, що -p -s разом" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" @@ -1737,180 +1753,188 @@ msgstr "" "затримати вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñ‡Ð°Ñу модифікації та прав доÑтупу до каталогів до " "ÐºÑ–Ð½Ñ†Ñ Ð²Ð¸Ñ‚ÑгуваннÑ" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "відмінити дії опції --delay-directory-restore" -#: src/tar.c:554 +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 #, fuzzy msgid "Handling of extended file attributes:" msgstr "Обробка атрибутів файлу:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" msgstr "" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" msgstr "" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" msgstr "" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" msgstr "" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" msgstr "" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" msgstr "" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" msgstr "" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" msgstr "" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "Вибір та зміна приÑтрою:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ÐРХІВ" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "викориÑтовувати вказаний файл або приÑтрій" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "файл архіву Ñ” локальним, навіть Ñкщо його назва міÑтить двокрапку" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "викориÑтовувати вказану команду заміÑÑ‚ÑŒ rmt" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "викориÑтовувати вказану команду заміÑÑ‚ÑŒ rsh" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "визначає приÑтрой та гуÑтину" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "Ñтворити, виводити зміÑÑ‚ або витÑгувати файли з багатотомного архіву" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "змінити Ñтрічку піÑÐ»Ñ Ð·Ð°Ð¿Ð¸Ñу ЧИСЛРx 1024 байтів" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "запуÑкати Ñценарій наприкінці кожної Ñтрічки (вмикає -M)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "викориÑтовувати/обновлÑти номер тому у ФÐЙЛІ" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "Ð‘Ð»Ð¾ÐºÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ñ€Ð¸Ñтрою:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "ЧИСЛО-БЛОКІВ" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "розмір запиÑу ЧИСЛО-БЛОКІВ x 512 байтів" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "вÑтановити розмір запиÑу у блоках по 512 байтів" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "ігнорувати нульові блоки в архіві (звичайно вказують кінець файлу)" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "розбивати на блоки під Ñ‡Ð°Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ (Ð´Ð»Ñ ÐºÐ°Ð½Ð°Ð»Ñ–Ð² 4.2BSD)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "Вибір формату архіву:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "ФОРМÐТ" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "Ñтворити архів у вказаному форматі" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "ФОРМÐТ будь-Ñкий з наÑтупних:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "Ñтарий формат V7" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "формат GNU, ÑуміÑний з верÑією tar <= 1.12" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "формат GNU, ÑуміÑний з верÑією tar 1.13.x" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "формат POSIX 1003.1-1988 (ustar)" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "формат POSIX 1003.1-2001 (pax)" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "те ж, що Ñ– pax" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "те ж, що Ñ– --format=v7" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "те ж, що Ñ– --format=posix" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "ключове_Ñлово[[:]=значеннÑ][,ключове_Ñлово[[:]=значеннÑ], ...]\"" -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ»ÑŽÑ‡Ð¾Ð²Ð¸Ð¼Ð¸ Ñловами pax" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "ТЕКСТ" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1918,77 +1942,75 @@ msgstr "" "Ñтворити архів з назвою тому \"ТЕКСТ\". Під Ñ‡Ð°Ñ Ð²Ð¸Ð²Ð¾Ð´Ñƒ зміÑту або " "витÑгуваннÑ, викориÑтовувати ТЕКСТ Ñк шаблон пошуку тому" -#: src/tar.c:660 +#: src/tar.c:684 msgid "Compression options:" msgstr "Опції ÑтиÑненнÑ:" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "вибирати програму ÑтиÑÐ½ÐµÐ½Ð½Ñ Ð·Ð° ÑуфікÑом архіву" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "не викориÑтовувати ÑÑƒÑ„Ñ–ÐºÑ Ð´Ð»Ñ Ð²Ð¸Ð±Ð¾Ñ€Ñƒ програми ÑтиÑненнÑ" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "ПРОГРÐÐœÐ" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "викориÑтовувати ПРОГРÐМУ Ð´Ð»Ñ ÑтиÑненнÑ/розтиÑÐºÐ°Ð½Ð½Ñ Ð°Ñ€Ñ…Ñ–Ð²Ñƒ" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "Вибір файлів:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "долучити ФÐЙЛ до архіву (кориÑне, Ñкщо його назва починаєтьÑÑ Ð· -)" -#: src/tar.c:687 -msgid "DIR" -msgstr "КÐТÐЛОГ" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "перейти до вказаного каталогу" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "читати назви файлів Ð´Ð»Ñ Ð´Ð¾Ð´Ð°Ð½Ð½Ñ/витÑÐ³ÑƒÐ²Ð°Ð½Ð½Ñ Ð· вказаного файла" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "" "файл, вказаний з опцією -T, міÑтить назви, відокремлені нульовими Ñимволами. " "Ð¦Ñ Ð¾Ð¿Ñ†Ñ–Ñ Ð²Ð¸Ð¼Ð¸ÐºÐ°Ñ” -C" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "відмінити дію попередньої опції --null" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" msgstr "уÑувати Ñ†Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð· назв файлів прочитаних за допомогою -T (типово)" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" msgstr "не уÑувати Ñ†Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð· назв файлів прочитаних за допомогою -T" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "ШÐБЛОÐ" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "не оброблÑти файли, назви Ñких відповідають вказаному шаблону" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "виключити назви що відповідають шаблонам, вказаним у файлі" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1996,94 +2018,108 @@ msgstr "" "не архівувати файли в каталогах, що міÑÑ‚ÑÑ‚ÑŒ CACHEDIR.TAG, з винÑтком Ñамого " "файлу" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "не архівувати жодні файли в каталогах, що міÑÑ‚ÑÑ‚ÑŒ CACHEDIR.TAG" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "не архівувати каталоги, що міÑÑ‚ÑÑ‚ÑŒ CACHEDIR.TAG" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "" "не архівувати файли в каталогах, що міÑÑ‚ÑÑ‚ÑŒ ФÐЙЛ, з винÑтком Ñамого файлу" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "не архівувати жодні файли в каталогах, що міÑÑ‚ÑÑ‚ÑŒ ФÐЙЛ" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "не архівувати каталоги, що міÑÑ‚ÑÑ‚ÑŒ ФÐЙЛ" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "не архівувати каталоги ÑиÑтем ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð²ÐµÑ€ÑÑ–Ñми" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "не архівувати резерві файли та файли блокуваннÑ" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "не заходити автоматично у каталоги" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "залишатиÑÑ Ñƒ локальної файлової ÑиÑтемі під Ñ‡Ð°Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð°Ñ€Ñ…Ñ–Ð²Ñƒ" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "рекурÑивно проходити каталоги (типово)" -#: src/tar.c:729 +#: src/tar.c:761 #, fuzzy msgid "don't strip leading '/'s from file names" msgstr "не видалÑти початкову коÑу риÑку `/' з назв файлів" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "Йти за Ñимвольними поÑиланнÑми: долучати файли, на Ñки вони вказують" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "Йти за жорÑткими поÑиланнÑми: долучати файли, на Ñки вони вказують" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "ÐÐЗВÐ-ФÐЙЛУ" -#: src/tar.c:735 +#: src/tar.c:767 #, fuzzy msgid "begin at member MEMBER-NAME when reading the archive" msgstr "починати обÑÐ»ÑƒÐ³Ð¾Ð²ÑƒÐ²Ð°Ð½Ð½Ñ Ð°Ñ€Ñ…Ñ–Ð²Ñƒ з вказаного файлу" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "долучати тільки такі файли, що Ñ” новіші за вказану дату або файл" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "ДÐТÐ" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "порівнювати тільки дату Ñ– Ñ‡Ð°Ñ Ð·Ð¼Ñ–Ð½Ð¸ даних" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "РЕЖИМ" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "перед видаленнÑм Ñтворювати резервні файли у вказаному режимі" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "РЯДОК" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -2091,101 +2127,101 @@ msgstr "" "перед видаленнÑм Ñтворювати резервні файли з указаним ÑуфікÑом (типово '~', " "Ñкщо не перевизначено змінною Ñередовища SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "ÐŸÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÑŽÐ²Ð°Ð½Ð½Ñ Ð½Ð°Ð·Ð² файлів:" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "видалÑти вказане ЧИСЛО компонентів з початку назв файлів" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "ВИРÐЗ" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "перетворювати назви файлів за допомогою вказаного виразу заміни" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "ÐšÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ñ€Ñ–Ð²Ð½ÑŽÐ²Ð°Ð½Ð½Ñм назв (впливає на взірці Ñк вилученнÑ, так Ñ– " "долученнÑ):" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "шаблони ігнорують відмінноÑÑ‚Ñ– у регіÑтрі Ñимволів" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "порівнювати шаблони з назвами файлів починаючи від початку назви" -#: src/tar.c:767 +#: src/tar.c:799 #, fuzzy msgid "patterns match after any '/' (default for exclusion)" msgstr "" "порівнювати шаблони з назвами файлів починаючи від будь-Ñкого / (типово)" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "шаблони враховують регіÑÑ‚Ñ€ (типово)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "кориÑтатиÑÑ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð°Ð¼Ð¸ (типово Ð´Ð»Ñ Ð²Ð¸Ð»ÑƒÑ‡ÐµÐ½Ð½Ñ)" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "порівнювати назви буквально" -#: src/tar.c:775 +#: src/tar.c:807 #, fuzzy msgid "wildcards do not match '/'" msgstr "шаблони не ÑтоÑуютьÑÑ Ð´Ð¾ '/'" -#: src/tar.c:777 +#: src/tar.c:809 #, fuzzy msgid "wildcards match '/' (default for exclusion)" msgstr "шаблони ÑтоÑуютьÑÑ Ð´Ð¾ '/' (типово)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Інформативний вивід:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "виводити докладну інформацію про оброблені файли" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "КЛ.-СЛОВО" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "ÐºÐµÑ€ÑƒÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ð¿ÐµÑ€ÐµÐ´Ð¶ÐµÐ½Ð½Ñми" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "виводити контрольне Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ ÐºÐ¾Ð¶Ð½Ðµ ЧИСЛО запиÑів (типово 10)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "ДІЯ" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "виконати вказану дію у контрольному пункті" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "виводити Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ñкщо до архіву було додано не вÑÑ– поÑиланнÑ" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "СИГÐÐЛ" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2196,35 +2232,35 @@ msgstr "" "- друкувати ÑтатиÑтику по отриманню цього Ñигналу; дозволеними Ñигналами Ñ” " "SIGHUP, SIGQUIT, SIGINT, SIGUSR1 Ñ– SIGUSR2, а також ці назви без префікÑа SIG" -#: src/tar.c:802 +#: src/tar.c:834 msgid "print file modification times in UTC" msgstr "друкувати Ñ‡Ð°Ñ Ð¼Ð¾Ð´Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ— файлів у UTC" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "друкувати Ñ‡Ð°Ñ Ð¼Ð¾Ð´Ð¸Ñ„Ñ–ÐºÐ°Ñ†Ñ–Ñ— файлів у повній вирізнÑльної здатноÑÑ‚Ñ–" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "виводити детальну інформацію у ФÐЙЛ" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "попереджувати кожне Ð¿Ð¾Ð²Ñ–Ð´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ð¾Ð¼ÐµÑ€Ð¾Ð¼ блоку в архіві" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "Запитувати Ð¿Ñ–Ð´Ñ‚Ð²ÐµÑ€Ð´Ð¶ÐµÐ½Ð½Ñ ÐºÐ¾Ð¶Ð½Ð¾Ñ— дії" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "вивеÑти типові налаштуваннÑ" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" @@ -2232,31 +2268,31 @@ msgstr "" "під Ñ‡Ð°Ñ Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð·Ð¼Ñ–Ñту або витÑÐ³ÑƒÐ²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñ–Ð² друкувати назви каталогів що " "не відповідають критеріÑм пошуку" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "показувати перетворені назви файлів" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "СТИЛЬ" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "вÑтановити Ñтиль цитуваннÑ; дозволені Ñтилі див. нижче" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "цитувати також вказані Ñимволи" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "вимкнути Ñ†Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð²ÐºÐ°Ð·Ð°Ð½Ð¸Ñ… Ñимволів" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "Опції ÑуміÑноÑÑ‚Ñ–:" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" @@ -2264,15 +2300,15 @@ msgstr "" "під Ñ‡Ð°Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð°Ñ€Ñ…Ñ–Ð²Ñƒ, те ж Ñаме, що Ñ– --old-archive. Під Ñ‡Ð°Ñ " "витÑгуваннÑ, те ж Ñаме, що --no-same-owner" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "Інші опції:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "заборонити кориÑÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´ÐµÑкими потенційно небезпечними опціÑми" -#: src/tar.c:978 +#: src/tar.c:1010 #, fuzzy msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " @@ -2280,40 +2316,40 @@ msgid "" msgstr "" "Ðе можна вказувати більш ніж одну з опцій `-Acdtrux' або `--test-label'" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Опції ÑтиÑÐ½ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ„Ð»Ñ–ÐºÑ‚ÑƒÑŽÑ‚ÑŒ одна з другою" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "Ðевідомий тип файла %s" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "Ðе знайдено файл-зразок дати" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "ВикориÑтовуєтьÑÑ %s заміÑÑ‚ÑŒ невідомого формату дати %s" -#: src/tar.c:1108 +#: src/tar.c:1140 #, fuzzy, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "ÐžÐ¿Ñ†Ñ–Ñ %s: Дату `%s' ÑприйнÑто Ñк %s" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "фільтрувати архів через %s" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "ДопуÑтимими аргументами опції --quoting-style Ñ”:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2321,48 +2357,48 @@ msgstr "" "\n" "Типові Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ *цієї* копії програми:\n" -#: src/tar.c:1295 +#: src/tar.c:1330 #, fuzzy msgid "Invalid owner or group ID" msgstr "Ðевірний влаÑник" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Ðеправильний фактор блокуваннÑ" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "Ðеправильна довжина Ñтрічки" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "ÐедійÑне Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ñ€Ñ–Ð²Ð½Ñ Ð°Ñ€Ñ…Ñ–Ð²Ð°Ñ†Ñ–Ñ—" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "Більш ніж одна гранична дата" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "ÐедійÑна верÑÑ–Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ñƒ розÑÑ–Ñних файлів" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "Ð¾Ð¿Ñ†Ñ–Ñ --atime-preserve='system' не підтримуєтьÑÑ Ð½Ð° цій платформі" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "аргумент --checkpoint муÑить бути цілим чиÑлом" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "Ðевірний формат прав доÑтупу" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "Ðевірне чиÑло" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" @@ -2370,71 +2406,68 @@ msgstr "" "ÐžÐ¿Ñ†Ñ–Ñ --preserve Ñ” заÑтарілою, заміÑÑ‚ÑŒ неї викориÑтовуйте --preserve-" "permissions --preserve-order" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Ðевірний розмір запиÑу" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "Розмір запиÑу має ділитиÑÑ Ð½Ð° %d." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "Ðевірна кількіÑÑ‚ÑŒ елементів" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "ДозволÑєтьÑÑ Ð»Ð¸ÑˆÐµ одна Ð¾Ð¿Ñ†Ñ–Ñ --to-command" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "Ðевірний аргумент Ð²ÐºÐ°Ð·Ð°Ð½Ð½Ñ Ð³ÑƒÑтини: `%s'" -#: src/tar.c:2133 +#: src/tar.c:2205 #, fuzzy, c-format msgid "Unknown density: '%c'" msgstr "Ðевідома гуÑтина: `%c'" -#: src/tar.c:2150 +#: src/tar.c:2222 #, fuzzy, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "Опції `-[0-7][lmh]' не підтримуютьÑÑ *цією* верÑією tar" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[ФÐЙЛ]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 +#, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "Шаблон %s заборонÑєтьÑÑ ÑƒÐ¶Ð¸Ð²Ð°Ñ‚Ð¸" + +#: src/tar.c:2389 #, fuzzy, c-format msgid "Old option '%c' requires an argument." msgstr "Стара Ð¾Ð¿Ñ†Ñ–Ñ `%c' потребує аргументу" -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "Ð²ÐºÐ°Ð·Ð°Ð½Ð½Ñ --occurrence не має ÑенÑу без Ð²ÐºÐ°Ð·Ð°Ð½Ð½Ñ Ð¿ÐµÑ€ÐµÐ»Ñ–ÐºÑƒ файлів" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "" -"опцію --occurrence не можна викориÑтовувати у зазначеному режимі роботи" - -#: src/tar.c:2408 +#: src/tar.c:2490 #, fuzzy msgid "Multiple archive files require '-M' option" msgstr "Ð’ÐºÐ°Ð·Ð°Ð½Ð½Ñ Ð´ÐµÐºÑ–Ð»ÑŒÐºÐ¾Ñ… файлів потребує Ð²ÐºÐ°Ð·Ð°Ð½Ð½Ñ Ð¾Ð¿Ñ†Ñ–Ñ— `-M'" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "Ðе можна викориÑтовувати --listed-incremental разом з --newer" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "ВикориÑÑ‚Ð°Ð½Ð½Ñ --level разом з --listed-incremental не має ÑенÑу" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" @@ -2442,79 +2475,75 @@ msgstr[0] "%s: Мітка тому Ñ” надто довга (Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ msgstr[1] "%s: Мітка тому Ñ” надто довга (Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ð² %lu байти)" msgstr[2] "%s: Мітка тому Ñ” надто довга (Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ Ð² %lu байтів)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Ðе можна перевірÑти багатотомні архіви" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Ðе можна перевірÑти ÑтиÑнені архіви" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "Шаблон %s заборонÑєтьÑÑ ÑƒÐ¶Ð¸Ð²Ð°Ñ‚Ð¸" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Ðе можна викориÑтовувати ÑтиÑÐ½ÐµÐ½Ð½Ñ Ð±Ð°Ð³Ð°Ñ‚Ð¾Ñ‚Ð¾Ð¼Ð½Ð¸Ñ… архівів" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "Ðе можна з'єднувати ÑтиÑнені архіви" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "ÐžÐ¿Ñ†Ñ–Ñ --pax-option викориÑтовуєтьÑÑ Ñ‚Ñ–Ð»ÑŒÐºÐ¸ з архівами у форматі POSIX" -#: src/tar.c:2478 +#: src/tar.c:2560 #, fuzzy msgid "--acls can be used only on POSIX archives" msgstr "ÐžÐ¿Ñ†Ñ–Ñ --pax-option викориÑтовуєтьÑÑ Ñ‚Ñ–Ð»ÑŒÐºÐ¸ з архівами у форматі POSIX" -#: src/tar.c:2483 +#: src/tar.c:2565 #, fuzzy msgid "--selinux can be used only on POSIX archives" msgstr "ÐžÐ¿Ñ†Ñ–Ñ --pax-option викориÑтовуєтьÑÑ Ñ‚Ñ–Ð»ÑŒÐºÐ¸ з архівами у форматі POSIX" -#: src/tar.c:2488 +#: src/tar.c:2570 #, fuzzy msgid "--xattrs can be used only on POSIX archives" msgstr "ÐžÐ¿Ñ†Ñ–Ñ --pax-option викориÑтовуєтьÑÑ Ñ‚Ñ–Ð»ÑŒÐºÐ¸ з архівами у форматі POSIX" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "Шаблон %s заборонÑєтьÑÑ ÑƒÐ¶Ð¸Ð²Ð°Ñ‚Ð¸" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" +msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "Розмір тому не може бути більшим від розміру запиÑу" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "ÐžÐ¿Ñ†Ñ–Ñ --preserve-order неÑуміÑна з --listed-incremental" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "Полохливо відмовлÑÑŽÑÑ Ñтворювати пуÑтий архів" -#: src/tar.c:2565 +#: src/tar.c:2669 #, fuzzy msgid "Options '-Aru' are incompatible with '-f -'" msgstr "Опції `-Aru' неÑуміÑні з `-f -'" -#: src/tar.c:2660 +#: src/tar.c:2766 #, fuzzy msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" msgstr "Ðеобхідно вказати одну з опцій `-Acdtrux' або `--test-label'" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "Ðевдачне Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð½Ñ Ð²Ð½Ð°Ñлідок попередніх помилок" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" @@ -2523,103 +2552,103 @@ msgstr[0] "%s: Файл ÑкоротивÑÑ Ð½Ð° %s байт" msgstr[1] "%s: Файл ÑкоротивÑÑ Ð½Ð° %s байти" msgstr[2] "%s: Файл ÑкоротивÑÑ Ð½Ð° %s байтів" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "Ключове Ñлово %s не Ñ” відоме або ще не реалізоване" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" msgstr "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¿Ð¾Ð·Ð½Ð°Ñ‡ÐºÐ¸ чаÑу поза допуÑтимими межами" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "Шаблон %s заборонÑєтьÑÑ ÑƒÐ¶Ð¸Ð²Ð°Ñ‚Ð¸" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "Ðе можна перевизначити ключове Ñлово %s" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "Ðевірно Ñформований розширений заголовок: бракує довжини" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "Довжина розширеного заголовку %*s Ñ” за межами діапазону" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "" "Ðевірно Ñформований розширений заголовок: відÑутній пробіл піÑÐ»Ñ Ð´Ð¾Ð²Ð¶Ð¸Ð½Ð¸" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "Ðевірно Ñформований розширений заголовок: відÑутній знак рівнÑннÑ" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "Ðевірно Ñформований розширений заголовок: відÑутній знак нового Ñ€Ñдка" -#: src/xheader.c:740 +#: src/xheader.c:741 #, fuzzy, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "Ðевідоме ключове Ñлово `%s' іґноруєтьÑÑ" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "Створена пара ключове Ñлово/Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ” за довга (ключ=%s, довжина=%s)" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "" "Ð—Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ñ€Ð¾Ð·ÑˆÐ¸Ñ€ÐµÐ½Ð¾Ð³Ð¾ заголовку %s=%s лежить поза допуÑтимими межами типу %s.." "%s" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Ðевірно Ñформований розширений заголовок: недійÑна змінна %s=%s" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Ðевірно Ñформований розширений заголовок: зайвий %s=%s" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "" "Ðевірно Ñформований розширений заголовок: змінна %s: неочікуваний розділювач " "%c" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "Ðевірно Ñформований розширений заголовок %s: непарна кількіÑÑ‚ÑŒ значень" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "%s: недійÑний ліміт чаÑу" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "%s: незнана діÑ" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "запиÑ" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "читаннÑ" @@ -2627,7 +2656,7 @@ msgstr "читаннÑ" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "Контрольна відмітка запиÑу %u" @@ -2636,7 +2665,7 @@ msgstr "Контрольна відмітка запиÑу %u" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "Контрольна відмітка Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ %u" @@ -2895,12 +2924,20 @@ msgstr "Команда завершилаÑÑ\n" msgid "--stat requires file names" msgstr "Ð¾Ð¿Ñ†Ñ–Ñ --stat вимагає назв файлів" -#~ msgid "Cannot get working directory" -#~ msgstr "Ðе вдаєтьÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ поточний каталог" - #~ msgid "sort names to extract to match archive" #~ msgstr "витÑгувати файли у порÑдку Ñ—Ñ… з'ÑÐ²Ð»ÐµÐ½Ð½Ñ Ð² архіві" +#, fuzzy +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "" +#~ "опцію --occurrence не можна викориÑтовувати у зазначеному режимі роботи" + +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "Ðе можна викориÑтовувати --listed-incremental разом з --newer" + +#~ msgid "--preserve-order is not compatible with --listed-incremental" +#~ msgstr "ÐžÐ¿Ñ†Ñ–Ñ --preserve-order неÑуміÑна з --listed-incremental" + #~ msgid "Field too long while reading snapshot file" #~ msgstr "З файла-знімка прочитано надто довге поле" @@ -2910,11 +2947,14 @@ msgstr "Ð¾Ð¿Ñ†Ñ–Ñ --stat вимагає назв файлів" #~ msgid "Unexpected field value in snapshot file" #~ msgstr "Ðеочікуваний кінець файла-знімка" -#~ msgid "Extended header length is out of allowed range" -#~ msgstr "Довжина розширеного заголовку Ñ” за межами діапазону" +#~ msgid "Cannot get working directory" +#~ msgstr "Ðе вдаєтьÑÑ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ñ‚Ð¸ поточний каталог" + +#~ msgid "%s: Directory removed before we read it" +#~ msgstr "%s: Каталог було видалено перед тим Ñк tar вÑтиг його прочитати" #~ msgid "Invalid group" #~ msgstr "ÐедійÑна група" -#~ msgid "%s: Directory removed before we read it" -#~ msgstr "%s: Каталог було видалено перед тим Ñк tar вÑтиг його прочитати" +#~ msgid "Extended header length is out of allowed range" +#~ msgstr "Довжина розширеного заголовку Ñ” за межами діапазону" diff --git a/po/vi.gmo b/po/vi.gmo index fd5f382..f1ed4bb 100644 Binary files a/po/vi.gmo and b/po/vi.gmo differ diff --git a/po/vi.po b/po/vi.po index d94ec29..1bd4ee3 100644 --- a/po/vi.po +++ b/po/vi.po @@ -1,19 +1,19 @@ # Vietnamese translation for Tar. -# Copyright © 2012 Free Software Foundation, Inc. +# Copyright © 2013 Free Software Foundation, Inc. # This file is distributed under the same license as the tar package. # Phan Vinh Thinh , 2005. # Clytie Siddall , 2007-2010. -# Trần Ngá»c Quân , 2012. +# Trần Ngá»c Quân , 2012-2013. # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" -"Project-Id-Version: tar-1.26\n" +"Project-Id-Version: tar-1.27\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" -"PO-Revision-Date: 2012-03-31 13:53+0700\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" +"PO-Revision-Date: 2013-10-07 14:21+0700\n" "Last-Translator: Trần Ngá»c Quân \n" -"Language-Team: Vietnamese \n" +"Language-Team: Vietnamese \n" "Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -68,30 +68,33 @@ msgid "" "Mandatory or optional arguments to long options are also mandatory or " "optional for any corresponding short options." msgstr "" -"Tham số ủy nhiệm hay tham số không bắt buá»™c cho các tùy chá»n dài cÅ©ng đồng " -"thá»i là ủy nhiệm hay không bắt buá»™c cho các tùy chá»n ngắn tÆ°Æ¡ng ứng." +"Các tham số là bắt buá»™c hay không bắt buá»™c cho các tùy chá»n dài thì cÅ©ng yêu " +"cầu nhÆ° thế khi dùng tùy chá»n ngắn tÆ°Æ¡ng ứng." #: gnu/argp-help.c:1643 msgid "Usage:" -msgstr "Sá»­ dụng:" +msgstr "Cách dùng:" #: gnu/argp-help.c:1647 msgid " or: " -msgstr " hoặc: " +msgstr " hoặc: " #: gnu/argp-help.c:1659 msgid " [OPTION...]" msgstr " [TÙY CHỌN...]" #: gnu/argp-help.c:1686 -#, fuzzy, c-format +#, c-format msgid "Try '%s --help' or '%s --usage' for more information.\n" -msgstr "Hãy thá»­ `%s --help' hoặc `%s --usage' để biết thêm thông tin.\n" +msgstr "Hãy chạy “%s --help†hoặc “%s --usage†để biết thêm thông tin.\n" #: gnu/argp-help.c:1714 #, c-format msgid "Report bugs to %s.\n" -msgstr "Thông báo lá»—i cho %s.\n" +msgstr "" +"Thông báo lá»—i cho %s.\n" +"Báo cáo lá»—i dịch cho nhóm dịch tiếng Việt: \n" #: gnu/argp-help.c:1933 gnu/error.c:190 msgid "Unknown system error" @@ -103,9 +106,9 @@ msgstr "hiển thị trợ giúp này" #: gnu/argp-parse.c:84 msgid "give a short usage message" -msgstr "hiển thị cách sá»­ dụng ngắn gá»n" +msgstr "hiển thị cách sá»­ dụng dạng ngắn gá»n" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "TÊN" @@ -128,7 +131,7 @@ msgstr "In ra phiên bản chÆ°Æ¡ng trình" #: gnu/argp-parse.c:161 msgid "(PROGRAM ERROR) No version known!?" -msgstr "(Lá»–I CHƯƠNG TRÃŒNH) Không rõ phiên bản !?" +msgstr "(Lá»–I CHƯƠNG TRÃŒNH) Không rõ phiên bản!?" #: gnu/argp-parse.c:614 #, c-format @@ -137,66 +140,66 @@ msgstr "%s: Quá nhiá»u đối số\n" #: gnu/argp-parse.c:757 msgid "(PROGRAM ERROR) Option should have been recognized!?" -msgstr "(Lá»–I CHƯƠNG TRÃŒNH) Tùy chá»n nên được nhận ra !?" +msgstr "(Lá»–I CHƯƠNG TRÃŒNH) Tùy chá»n nên được nhận ra!?" #: gnu/closeout.c:114 msgid "write error" msgstr "lá»—i ghi" #: gnu/getopt.c:549 gnu/getopt.c:578 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s' is ambiguous; possibilities:" -msgstr "%s: tùy chá»n « %s » vẫn mÆ¡ hồ\n" +msgstr "%s: tùy chá»n “%s†chÆ°a rõ ràng; khả năng là:" #: gnu/getopt.c:626 gnu/getopt.c:630 #, c-format msgid "%s: option '--%s' doesn't allow an argument\n" -msgstr "%s: tùy chá»n « --%s » không cho phép đối số\n" +msgstr "%s: tùy chá»n “--%s†không cho phép đối số\n" #: gnu/getopt.c:639 gnu/getopt.c:644 #, c-format msgid "%s: option '%c%s' doesn't allow an argument\n" -msgstr "%s: tùy chá»n « %c%s » không cho phép đối số\n" +msgstr "%s: tùy chá»n “%c%s†không cho phép đối số\n" #: gnu/getopt.c:687 gnu/getopt.c:706 #, c-format msgid "%s: option '--%s' requires an argument\n" -msgstr "%s: tùy chá»n « --%s » yêu cầu má»™t đối số\n" +msgstr "%s: tùy chá»n “--%s†yêu cầu má»™t đối số\n" #: gnu/getopt.c:744 gnu/getopt.c:747 #, c-format msgid "%s: unrecognized option '--%s'\n" -msgstr "%s: không nhận ra tuỳ chá»n « --%s »\n" +msgstr "%s: không nhận ra tuỳ chá»n “--%sâ€\n" #: gnu/getopt.c:755 gnu/getopt.c:758 #, c-format msgid "%s: unrecognized option '%c%s'\n" -msgstr "%s: không nhận ra tuỳ chá»n « %c%s »\n" +msgstr "%s: không nhận ra tuỳ chá»n “%c%sâ€\n" #: gnu/getopt.c:807 gnu/getopt.c:810 #, c-format msgid "%s: invalid option -- '%c'\n" -msgstr "%s: tùy chá»n sai -- « %c »\n" +msgstr "%s: tùy chá»n sai -- “%câ€\n" #: gnu/getopt.c:863 gnu/getopt.c:880 gnu/getopt.c:1090 gnu/getopt.c:1108 #, c-format msgid "%s: option requires an argument -- '%c'\n" -msgstr "%s: tùy chá»n yêu cầu má»™t đối số -- « %c »\n" +msgstr "%s: tùy chá»n yêu cầu má»™t đối số -- “%câ€\n" #: gnu/getopt.c:936 gnu/getopt.c:952 #, c-format msgid "%s: option '-W %s' is ambiguous\n" -msgstr "%s: tùy chá»n « -W %s » vẫn mÆ¡ hồ\n" +msgstr "%s: tùy chá»n “-W %s†vẫn chÆ°a rõ ràng\n" #: gnu/getopt.c:976 gnu/getopt.c:994 #, c-format msgid "%s: option '-W %s' doesn't allow an argument\n" -msgstr "%s: tùy chá»n « -W %s » không cho phép đối số\n" +msgstr "%s: tùy chá»n “-W %s†không cho phép đối số\n" #: gnu/getopt.c:1015 gnu/getopt.c:1033 #, c-format msgid "%s: option '-W %s' requires an argument\n" -msgstr "%s: tùy chá»n « -W %s » yêu cầu má»™t đối số\n" +msgstr "%s: tùy chá»n “-W %s†yêu cầu má»™t đối số\n" #: gnu/obstack.c:415 gnu/obstack.c:417 gnu/xalloc-die.c:36 msgid "memory exhausted" @@ -235,11 +238,11 @@ msgstr "không trở được vá» thÆ° mục làm việc đầu tiên" #. and use glyphs suitable for your language. #: gnu/quotearg.c:314 msgid "`" -msgstr "`" +msgstr "“" #: gnu/quotearg.c:315 msgid "'" -msgstr "'" +msgstr "â€" #. TRANSLATORS: A regular expression testing for an affirmative answer #. (english: "yes"). Testing the first character may be sufficient. @@ -321,7 +324,7 @@ msgid "" "Written by %s, %s, %s,\n" "and %s.\n" msgstr "" -"Tác giả: %s, %s, %s\n" +"Viết bởi %s, %s, %s\n" "và %s.\n" #. TRANSLATORS: Each %s denotes an author name. @@ -370,7 +373,7 @@ msgid "" "%s, %s, %s, %s,\n" "and %s.\n" msgstr "" -"Tác giả: %s, %s, %s,\n" +"Viết bởi %s, %s, %s,\n" "%s, %s, %s, %s\n" "và %s.\n" @@ -384,7 +387,7 @@ msgid "" "%s, %s, %s, %s,\n" "%s, and %s.\n" msgstr "" -"Tác giả: %s, %s, %s,\n" +"Viết bởi %s, %s, %s,\n" "%s, %s, %s, %s,\n" "%s và %s.\n" @@ -398,7 +401,7 @@ msgid "" "%s, %s, %s, %s,\n" "%s, %s, and others.\n" msgstr "" -"Tác giả: %s, %s, %s,\n" +"Viết bởi %s, %s, %s,\n" "%s, %s, %s, %s,\n" "%s, %s và các ngÆ°á»i khác.\n" @@ -413,13 +416,17 @@ msgid "" "Report bugs to: %s\n" msgstr "" "\n" -"Báo cáo lá»—i nào cho: %s\n" -"Báo cáo lá»—i dịch nào cho Clytie: \n" +"Báo cáo lá»—i cho: %s\n" +"Báo cáo lá»—i dịch cho nhóm dịch tiếng Việt: \n" #: gnu/version-etc.c:249 #, c-format msgid "Report %s bugs to: %s\n" -msgstr "Báo cáo lá»—i %s nào cho: %s\n" +msgstr "" +"Báo cáo lá»—i liên quan đến %s cho: %s\n" +"Báo cáo lá»—i dịch cho nhóm dịch tiếng Việt: \n" #: gnu/version-etc.c:253 #, c-format @@ -440,7 +447,7 @@ msgstr "" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s: Không thể %s" @@ -449,54 +456,54 @@ msgstr "%s: Không thể %s" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s: Cảnh báo: Không thể %s" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" -msgstr "%s: Không thay đổi được chế Ä‘á»™ thành %s" +msgstr "%s: Không thể thay đổi chế Ä‘á»™ thành %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s: Không thay đổi được quyá»n sở hữu thành uid %lu, gid %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s: Không tạo được liên kết cứng tá»›i %s" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Lá»—i Ä‘á»c tại byte %s, trong khi Ä‘á»c %lu byte" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" msgstr[0] "%s: Cảnh báo: Lá»—i Ä‘á»c tại byte %s, trong khi Ä‘á»c %lu byte" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" -msgstr "%s: Không thể tìm tá»›i %s" +msgstr "%s: Không thể di chuyển vị trí Ä‘á»c tá»›i %s" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" -msgstr "%s: Cảnh báo: Không thể tìm tá»›i %s" +msgstr "%s: Cảnh báo: Không thể di chuyển vị trí Ä‘á»c tá»›i %s" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s: Không tạo được liên kết má»m tá»›i %s" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -505,20 +512,20 @@ msgstr[0] "%s: Chỉ ghi %lu trong số %lu byte" #: lib/paxnames.c:140 #, c-format msgid "Removing leading `%s' from member names" -msgstr "Äang bá» Ä‘i phần dẫn đầu `%s' từ tên của các thành viên" +msgstr "Äang bá» Ä‘i phần dẫn đầu “%s†từ tên của các thành viên" #: lib/paxnames.c:141 #, c-format msgid "Removing leading `%s' from hard link targets" -msgstr "Äang bá» Ä‘i phần dẫn đầu `%s' từ đích của các liên kết cứng" +msgstr "Äang bá» Ä‘i phần dẫn đầu “%s†từ đích của các liên kết cứng" #: lib/paxnames.c:154 msgid "Substituting `.' for empty member name" -msgstr "Äang thay thế `.' cho tên rá»—ng của các thành viên" +msgstr "Äang thay thế “.†cho tên rá»—ng của các thành viên" #: lib/paxnames.c:155 msgid "Substituting `.' for empty hard link target" -msgstr "Äang thay thế `.' cho đích đến rá»—ng của liên kết cứng" +msgstr "Äang thay thế “.†cho đích đến rá»—ng của liên kết cứng" #: lib/rtapelib.c:299 #, c-format @@ -538,12 +545,12 @@ msgstr "đầu ra tiêu chuẩn" #: lib/rtapelib.c:429 #, c-format msgid "Cannot connect to %s: resolve failed" -msgstr "Không thể kết nối tá»›i %s: lá»—i giải quyết" +msgstr "Không thể kết nối tá»›i %s: gặp lá»—i khi phân giải" #: lib/rtapelib.c:502 -#, fuzzy, c-format +#, c-format msgid "Cannot redirect files for remote shell" -msgstr "Không thể chạy shell ở xa" +msgstr "Không thể chuyển hÆ°á»›ng kết xuất các tập tin cho hệ vá» truy cập từ xa" #: lib/rtapelib.c:516 #, c-format @@ -556,23 +563,23 @@ msgstr "HÆ°á»›ng tìm kiếm vượt quá vùng cho phép" #: rmt/rmt.c:438 msgid "Invalid seek direction" -msgstr "Sai đặt hÆ°á»›ng tìm nÆ¡i" +msgstr "HÆ°á»›ng di chuyển vị trí Ä‘á»c không hợp lệ" #: rmt/rmt.c:446 msgid "Invalid seek offset" -msgstr "Sai đặt khoảng chênh tìm nÆ¡i" +msgstr "Khoảng bù di chuyển vị trí Ä‘á»c không hợp lệ" #: rmt/rmt.c:452 msgid "Seek offset out of range" -msgstr "Bá»™ tìm kiếm vượt quá vùng cho phép" +msgstr "Khoảng bù di chuyển vị trí Ä‘á»c vượt quá phạm vi cho phép" #: rmt/rmt.c:493 rmt/rmt.c:544 rmt/rmt.c:608 msgid "Invalid byte count" -msgstr "Sai đếm byte" +msgstr "Sai số lượng byte" #: rmt/rmt.c:499 rmt/rmt.c:550 rmt/rmt.c:614 rmt/rmt.c:625 msgid "Byte count out of range" -msgstr "Số đếm byte ở ngoại phạm vi" +msgstr "Số lượng byte nằm ngoài phạm vi" #: rmt/rmt.c:558 msgid "Premature eof" @@ -594,8 +601,8 @@ msgstr "Gặp đối số bất thÆ°á»ng" msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "Thao tác má»™t ổ băng từ, chấp nhận lệnh từ má»™t tiến trình ở xa" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "Sá»" @@ -603,12 +610,12 @@ msgstr "Sá»" msgid "set debug level" msgstr "đặt cấp gỡ rối" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" -msgstr "TẬP TIN" +msgstr "TẬP-TIN" #: rmt/rmt.c:699 msgid "set debug output file name" @@ -628,172 +635,181 @@ msgstr "quá nhiá»u đối số" msgid "Garbage command" msgstr "Câu lệnh rác" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "Äây có vẻ không phải là má»™t kho lÆ°u tar" -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" -msgstr "Tổng số byte đã ghi" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" msgstr "Tổng số byte đã Ä‘á»c" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "Tổng số byte đã ghi" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "Tổng số byte đã xoá: %s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(Ä‘Æ°á»ng ống)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" -msgstr "Giá trị cho record_size không đúng" +msgstr "Giá trị cho `record_size' không đúng" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "Không Ä‘Æ°a ra tên kho lÆ°u" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "Không kiểm tra được kho lÆ°u stdin/stdout" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "Kho lÆ°u được nén. Hãy sá»­ dụng tùy chá»n %s" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "Không cập nhật được kho lÆ°u đã nén" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" -msgstr "Tại đầu băng ghi âm, thoát ra bây giá»" +msgstr "Tại đầu băng từ, thoát ra bây giá»" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "Quá nhiá»u lá»—i, Ä‘ang thoát" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "Kích cỡ mục ghi = %lu khối" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "Khối chÆ°a sắp hàng (%lu byte) trong kho lÆ°u" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "" "Không thể \"tua\" lại tập tin kho lÆ°u; nó có thể không Ä‘á»c được khi không có " -"« -i »" +"“-iâ€" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek không dừng lại tại má»™t ranh giá»›i bản ghi" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s: chứa số thứ tá»± khối không đúng" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "Số thứ tá»± khối thừa ra" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "Chuẩn bị khối #%d cho %s và nhấn Enter: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" -msgstr "Kết thúc tập tin (EOF) khi mong đợi trả lá»i của ngÆ°á»i dùng" +msgstr "Kết thúc tập tin (EOF) bất ngá» khi cần trả lá»i của ngÆ°á»i dùng" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "CẢNH BÃO: Kho lÆ°u không hoàn thành" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" " q Abort tar\n" " y or newline Continue operation\n" msgstr "" -" n TÊN ÄÆ°a ra tên tập tin má»›i cho (các) khối tin tiếp theo (và theo sau)\n" -" q Dừng tar\n" -" y hay dòng má»›i\tTiếp tục lại chạy tiến trình\n" +" n TÊN ÄÆ°a ra tên tập tin má»›i cho (các) khối tin tiếp theo (và theo " +"sau)\n" +" q Dừng tar\n" +" y hay dòng má»›i Tiếp tục lại chạy tiến trình\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" -msgstr " ! Tạo má»™t trình bao con\n" +msgstr " ! Sản sinh má»™t hệ vá» con\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? In ra danh sách này\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "Không có khối má»›i; Ä‘ang thoát.\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" -msgstr "ChÆ°a ghi rõ tên tập tin: hãy thá»­ lại.\n" +msgstr "ChÆ°a ghi rõ tên tập tin. Hãy thá»­ lại.\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" -msgstr "Gõ sai. (Gá» ? để xem trợ giúp.)\n" +msgstr "Gõ sai. (Gõ ? để xem trợ giúp.)\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "Câu lệnh %s không thành công" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s có thể tiếp tục trên khối tin này: phần đầu chứa tên bị cắt ngắn" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s không tiếp tục trên khối này" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s là kích thÆ°á»›c sai (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "Khối tin này vượt quá dãy cho phép (%s - %s != %s)" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "Kho lÆ°u không có nhãn tÆ°Æ¡ng ứng vá»›i %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "Khối %s không tÆ°Æ¡ng ứng %s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" @@ -801,7 +817,7 @@ msgstr "" "%s: tên tập tin quá dài để chứa trong má»™t phần đầu Ä‘a khối GNU nên bị cắt " "ngắn" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "tiến trình ghi (write) không dừng lại tại má»™t ranh giá»›i khối" @@ -811,16 +827,16 @@ msgid "Could only read %lu of %lu byte" msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "Chỉ Ä‘á»c được %lu từ %lu byte" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "Diff ná»™i dung" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" -msgstr "Kết thúc tập tin không mong đợi trong kho lÆ°u" +msgstr "Kết thúc tập tin bất ngá» trong kho lÆ°u" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "Diff dạng tập tin" @@ -840,7 +856,7 @@ msgstr "Khác biệt Gid" msgid "Mod time differs" msgstr "Khác biệt thá»i gian sá»­a đổi" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "Khác biệt kích thÆ°á»›c" @@ -857,36 +873,36 @@ msgstr "Khác biệt liên kết má»m" msgid "Device number differs" msgstr "Diff số thứ tá»± của thiết bị" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "Kiểm tra " -#: src/compare.c:471 -#, fuzzy, c-format +#: src/compare.c:473 +#, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "" -"%s: Không rõ dạng tập tin '%c' nên khác biệt (diff) nhÆ° tập tin thông thÆ°á»ng" +"%s: Không rõ kiểu tập tin “%c†nên khác biệt (diff) nhÆ° tập tin thông thÆ°á»ng" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "Kho lÆ°u chứa tên tập tin không có tiá»n tố ở đầu." -#: src/compare.c:533 +#: src/compare.c:535 msgid "Archive contains transformed file names." msgstr "Tài liệu được nén có chứa tên tệp tin chuyển đổi." -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "Sá»± kiểm tra có thể không định vị được các tập tin gốc." -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "Lá»–I KIỂM TRA: tìm thấy %d phần đầu không đúng" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "Má»™t khối không Ä‘Æ¡n lẻ tại %s" @@ -908,7 +924,7 @@ msgstr "giá trị %s vượt quá %s phạm vi %s..%s" #: src/create.c:328 msgid "Generating negative octal headers" -msgstr "Äang tạo phần đầu hệ tám âm" +msgstr "Äang tạo phần đầu hệ bát phân âm" #: src/create.c:601 src/create.c:664 #, c-format @@ -931,55 +947,55 @@ msgid "%s: File shrank by %s byte; padding with zeros" msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "%s: Tập tin được rút ngắn %s byte; Ä‘á»™n vào bắng các số không" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s: tập tin trên má»™t hệ thống tập tin khác; không được dump" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "chÆ°a đổ ná»™i dung" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" -msgstr "%s: Không rõ dạng tập tin; tập tin bị lá» Ä‘i" +msgstr "%s: Không hiểu kiểu tập tin; tập tin bị lá» Ä‘i" -#: src/create.c:1549 +#: src/create.c:1551 #, c-format msgid "Missing links to %s." msgstr "Thiếu liên kết tá»›i %s." -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: tập tin chÆ°a thay đổi; không được dump" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: tập tin là kho lÆ°u; không được đổ" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "chÆ°a đổ thÆ° mục" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: tập tin đã thay đổi khi chúng ta Ä‘á»c nó" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: socket bị lá» Ä‘i" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: cá»­a (door) bị lá» Ä‘i" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "Nhảy tá»›i phần đầu tiếp theo" @@ -995,49 +1011,50 @@ msgstr "%s: tem thá»i gian cÅ© không hợp lý %s" #: src/extract.c:320 #, c-format msgid "%s: time stamp %s is %s s in the future" -msgstr "%s: tem thá»i gian %s là %s giây trong tÆ°Æ¡ng lai" +msgstr "%s: dấu vết thá»i gian %s là %s giây trong tÆ°Æ¡ng lai" #: src/extract.c:536 #, c-format msgid "%s: Unexpected inconsistency when making directory" -msgstr "%s: Sá»± mâu thuẫn không mong đợi khi tạo thÆ° mục" +msgstr "%s: Sá»± mâu thuẫn bất ngá» khi tạo thÆ° mục" #: src/extract.c:705 #, c-format msgid "%s: skipping existing file" -msgstr "" +msgstr "%s: bá» qua tập tin sẵn có" #: src/extract.c:821 #, c-format msgid "%s: Directory renamed before its status could be extracted" -msgstr "%s: Äổi tên thÆ° mục trÆ°á»›c khi có thể giải phóng trạng thái của nó" +msgstr "%s: Äổi tên thÆ° mục trÆ°á»›c khi có thể rút trích trạng thái của nó" #: src/extract.c:1010 msgid "Extracting contiguous files as regular files" -msgstr "Giải nén các tập tin liá»n nhau thành những tập tin thông thÆ°á»ng" +msgstr "Rút trích các tập tin liá»n nhau thành những tập tin thông thÆ°á»ng" #: src/extract.c:1365 msgid "Attempting extraction of symbolic links as hard links" -msgstr "Äang thá»­ giải nén liên kết má»m thành liên kết cứng" +msgstr "Äang thá»­ rút trích liên kết má»m thành liên kết cứng" #: src/extract.c:1528 #, c-format msgid "%s: Cannot extract -- file is continued from another volume" -msgstr "%s: Không giải nén được -- tập tin tiếp tục từ khối khác" +msgstr "%s: Không rút trích được -- tập tin tiếp tục từ khối khác" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" -msgstr "Phần đầu tên dài không mong đợi" +msgstr "Gặp phần đầu tên dài bất ngá»" #: src/extract.c:1542 -#, fuzzy, c-format +#, c-format msgid "%s: Unknown file type '%c', extracted as normal file" -msgstr "%s: Dạng tập tin không rõ '%c' nên giải nén nhÆ° tập tin thông thÆ°á»ng" +msgstr "" +"%s: Không hiểu kiểu tập tin “%c†nên rút trích nhÆ° tập tin thông thÆ°á»ng" #: src/extract.c:1568 #, c-format msgid "Current %s is newer or same age" -msgstr "%s hiện thá»i là má»›i hay hay cùng thá»i" +msgstr "%s hiện tại là má»›i hÆ¡n hoặc cùng tuổi" #: src/extract.c:1620 #, c-format @@ -1060,345 +1077,344 @@ msgid "%s: Directory is new" msgstr "%s: ThÆ° mục là má»›i" #: src/incremen.c:566 -#, fuzzy, c-format +#, c-format msgid "%s: directory is on a different filesystem; not dumped" -msgstr "%s: tập tin trên má»™t hệ thống tập tin khác; không được dump" +msgstr "%s: thÆ° mục trên má»™t hệ thống tập tin khác; nên không được dump (đổ)" #: src/incremen.c:587 #, c-format msgid "%s: Directory has been renamed" msgstr "%s: ThÆ° mục đã bị đổi tên" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "Dấu vết thá»i gian không hợp lệ" -#: src/incremen.c:1045 -#, fuzzy +#: src/incremen.c:1047 msgid "Invalid modification time" -msgstr "Thá»i gian sá»­a đổi không hợp lệ (giây)" +msgstr "Thá»i gian sá»­a đổi không hợp lệ" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "Thá»i gian sá»­a đổi không hợp lệ (nanô-giây)" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "Số thứ tá»± thiết bị không đúng" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "Số thứ tá»± chỉ mục inode sai" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" -msgstr "" +msgstr "%s: byte %s: %s %.*s... quá dài" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" -msgstr "Kết thúc tập tin (EOF) không mong đợi trong tập tin ảnh chụp" +msgstr "Kết thúc tập tin (EOF) bất ngá» trong tập tin ảnh chụp" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" -msgstr "" +msgstr "%s: byte %s: %s %s được theo sau bởi byte 0x%02x không hợp lệ" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" +"%s: byte %s: (vùng %s..%s không hợp lệ)\n" +"\t%s %s" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" -msgstr "" +msgstr "%s: byte %s: %s %s" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" -msgstr "" +msgstr "%s: byte %s: %s" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "Thiếu dấu giá»›i hạn mục ghi" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "Äịnh dạng tập tin dần sai" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "Phiên bản định dạng dần không được há»— trợ: %" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" -msgstr "ThÆ° mục đổ dạng sai: mong đợi « %c » còn tìm %#3o" +msgstr "ThÆ° mục đổ dạng sai: cần “%c†nhÆ°ng lại nhận được %#3o" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" -msgstr "ThÆ° mục đổ dạng sai: « X » đã nhân đôi" +msgstr "ThÆ° mục đổ dạng sai: “X†đã nhân đôi" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" -msgstr "ThÆ° mục đổ dạng sai: tên rá»—ng trong « R »" +msgstr "ThÆ° mục đổ dạng sai: tên rá»—ng trong “Râ€" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" -msgstr "ThÆ° mục đổ dạng sai: « T » không có « R » Ä‘i trÆ°á»›" +msgstr "ThÆ° mục đổ dạng sai: “T†không có “R†đi trÆ°á»›c" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" -msgstr "ThÆ° mục đổ dạng sai: tên rá»—ng trong « T »" +msgstr "ThÆ° mục đổ dạng sai: tên rá»—ng trong “Tâ€" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" -msgstr "ThÆ° mục đổ dạng sai: mong đợi « %c » còn tìm kết thúc dữ liệu" +msgstr "ThÆ° mục đổ dạng sai: cần “%c†nhÆ°ng lại gặp kết thúc dữ liệu" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" -msgstr "ThÆ° mục đổ dạng sai: « X » không bao giá» dùng" +msgstr "ThÆ° mục đổ dạng sai: “X†không bao giá» dùng" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "Không thể tạo thÆ° mục tạm bằng mẫu %s" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s: Không làm sạch thÆ° mục: không thể lấy trạng thái (stat)" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: thÆ° mục trên má»™t thiết bị khác: không làm sạch" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s: Äang xóa %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s: Không thể xóa bá»" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s: Äang bá» Ä‘i" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "khối %s: ** Khối của các số không (NUL) **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "khối %s: ** Kết thúc tập tin **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "khối %s: " #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" -msgstr "Khoảng trống trong Phần đầu trong khi mong đợi má»™t giá trị số %s" +msgstr "Khoảng trống trong Phần đầu trong khi cần má»™t giá trị số %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "" "Giá trị hệ tám %.*s của kho lÆ°u vượt ra phạm vi %s; coi nhÆ° phần bù của hai" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "Giá trị hệ tám %.*s của kho lÆ°u vượt ra phạm vi %s" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "Kho lÆ°u chứa phần đầu base-64 không còn dùng nữa" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "Kho lÆ°u ký chuá»—i base-64 %s vượt ra ngoài vùng %s" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "Giá trị base-256 của kho lÆ°u vượt ra ngoài vùng %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" -msgstr "Kho lÆ°u chứa %.*s nÆ¡i mà lại mong đợi giá trị số %s" +msgstr "Kho lÆ°u chứa %.*s nÆ¡i mà cần giá trị số %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "Giá trị kho lÆ°u %s vượt quá phạm vi %s (%s..%s)" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " liên kết tá»›i %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " kiểu tập tin không rõ %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--Liên kết Dài--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--Tên Dài--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--Phần đầu Khối--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--Tiếp tục tại byte %s--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "Äang tạo thÆ° mục:" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "Äang đổi tên %s thành %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s: Không thể đổi tên thành %s" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "Äang đổi tên %s ngược lại thành %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s: Tập tin bị xóa trÆ°á»›c khi chúng ta Ä‘á»c nó" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "tiến trình con" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" -msgstr "kênh (channel) giữa các tiến trình" +msgstr "kênh liên tiến trình" #: src/names.c:360 -#, fuzzy msgid "command line" -msgstr "Câu lệnh %s không thành công" +msgstr "dòng lệnh" #: src/names.c:378 -#, fuzzy, c-format +#, c-format msgid "%s: file list requested from %s already read from %s" -msgstr "%s: danh sách tập tin đã được Ä‘á»c" +msgstr "%s: danh sách tập tin đã yêu cầu từ %s đã sẵn được Ä‘á»c từ %s" -#: src/names.c:448 -#, fuzzy, c-format +#: src/names.c:448 src/checkpoint.c:274 +#, c-format msgid "cannot split string '%s': %s" -msgstr "không thể đặt thá»i gian trên « %s »" +msgstr "không thể chia tách chuá»—i “%sâ€: %s" #: src/names.c:490 #, c-format msgid "%s: file name read contains nul character" msgstr "%s: Ä‘á»c tên tập tin chứa ký tá»± vô giá trị" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "Tên tập tin chứa ký tá»± khá»›p mẫu" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "" -"Dùng « --wildcards » (ký tá»± đặi diện) để hiệu lá»±c chức năng khá»›p mẫu,\n" -"hoặc « --no-wildcards » để thu hồi cảnh báo này." +"Dùng “--wildcards†(ký tá»± đặi diện) để hiệu lá»±c chức năng khá»›p mẫu,\n" +"hoặc “--no-wildcards†để thu hồi cảnh báo này." -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s: Không tìm thấy trong kho lÆ°u" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s: Không tìm thấy phần tá»­ yêu cầu trong kho lÆ°u" -#: src/names.c:876 +#: src/names.c:879 #, c-format msgid "Archive label mismatch" msgstr "Sai khá»›p nhãn kho lÆ°u" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "" -"Sá»­ dụng tuỳ chá»n « -C » bên trong danh sách tập tin không được phép vá»›i « --" -"listed-incremental »" +"Sá»­ dụng tuỳ chá»n “-C†bên trong danh sách tập tin không được phép vá»›i “--" +"listed-incrementalâ€" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" -msgstr "Chỉ cho phép má»™t tuỳ chá»n « -C » vá»›i « --listed-incremental »" +msgstr "Chỉ cho phép má»™t tuỳ chá»n “-C†vá»›i “--listed-incrementalâ€" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" -msgstr "Cả hai tùy chá»n `-%s' và `-%s' Ä‘á»u muốn dữ liệu nhập vào tiêu chuẩn" +msgid "Options '%s' and '%s' both want standard input" +msgstr "Cả hai tùy chá»n “-%s†và “-%s†đá»u muốn đầu vào tiêu chuẩn" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s: Äịnh dạng kho lÆ°u không đúng" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "Muốn tính năng GNU trên định dạng kho lÆ°u không tÆ°Æ¡ng thích" -#: src/tar.c:255 -#, fuzzy, c-format +#: src/tar.c:264 +#, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." msgstr "" -"Không rõ kiểu dáng trích dẫn « %s ». Hãy thá»­ lệnh « %s --quoting-style=help " -"» để xem danh sách." +"Không rõ kiểu trích dẫn “%sâ€. Hãy chạy lệnh “%s --quoting-style=help†để lấy " +"danh sách." -#: src/tar.c:364 -#, fuzzy +#: src/tar.c:378 msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " "can restore individual files from the archive.\n" @@ -1408,17 +1424,16 @@ msgid "" " tar -tvf archive.tar # List all files in archive.tar verbosely.\n" " tar -xf archive.tar # Extract all files from archive.tar.\n" msgstr "" -"ChÆ°Æ¡ng trình `tar' của GNU ghi nhiá»u tập tin vào cùng má»™t kho lÆ°u băng từ " -"hay lên Ä‘Ä©a, và có thể phục hồi từng tập tin riêng rẽ từ kho lÆ°u này.\n" +"ChÆ°Æ¡ng trình “tar†của GNU ghi nhiá»u tập tin vào cùng má»™t kho lÆ°u lên băng " +"từ hay Ä‘Ä©a, và có thể phục hồi từng tập tin riêng lẻ từ kho lÆ°u này.\n" "\n" "Ví dụ:\n" " tar -cf kho.tar foo bar # Tạo kho.tar từ các tập tin foo và bar.\n" " tar -tvf kho.tar # Liệt kê chi tiết tất cả các tập tin có trong " "kho.tar.\n" -" tar -xf kho.tar # Giải phóng tất cả các tập tin ra từ kho.tar.\n" +" tar -xf kho.tar # Rút trích tất cả các tập tin từ kho.tar.\n" -#: src/tar.c:373 -#, fuzzy +#: src/tar.c:387 msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" "The version control may be set with --backup or VERSION_CONTROL, values " @@ -1429,89 +1444,90 @@ msgid "" " nil, existing numbered if numbered backups exist, simple otherwise\n" " never, simple always make simple backups\n" msgstr "" -"Hậu tố kho lÆ°u là `~', trừ khi được đặt vá»›i « --suffix » hay " +"Hậu tố sao lÆ°u dá»± phòng là “~†trừ phi được đặt vá»›i “--suffix†hay " "SIMPLE_BACKUP_SUFFIX.\n" -"Có thể đặt Ä‘iá»u khiển phiên bản bằng « --backup » hay VERSION_CONTROL,\n" -"các giá trị là:\n" +"Có thể đặt Ä‘iá»u khiển phiên bản bằng “--backup†hay VERSION_CONTROL, các giá " +"trị là:\n" "\n" -" none, off \tkhông bao giá» tạo kho lÆ°u\n" -" t, numbered tạo kho lÆ°u đánh số\n" -" nil, existing đánh số nếu kho lÆ°u tồn tại, nếu không thì Ä‘Æ¡n giản\n" -" never, simple luôn luôn tạo kho lÆ°u Ä‘Æ¡n giản\n" +" none, off không bao giá» tạo bản sao dá»± phòng\n" +" t, numbered đánh số thứ tá»±\n" +" nil, existing đánh số thứ tá»± nếu có kho lÆ°u trÆ°á»›c đó, không thì dùng " +"dạng Ä‘Æ¡n giản\n" +" never, simple luôn luôn tạo bản sao lÆ°u dạng Ä‘Æ¡n giản\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "Chế Ä‘á»™ thao tác chính:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "liệt kê ná»™i dung của má»™t kho lÆ°u" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" -msgstr "giải phóng các tập tin từ má»™t kho lÆ°u" +msgstr "rút trích các tập tin từ má»™t kho lÆ°u" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "tạo má»™t kho lÆ°u má»›i" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "tìm sá»± khác nhau giữa kho lÆ°u và hệ thống tập tin" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "thêm các tập tin vào cuối má»™t kho lÆ°u" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "chỉ thêm những tập tin má»›i hÆ¡n bản sao trong kho lÆ°u" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "thêm các tập tin tar vào má»™t kho lÆ°u" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "xóa từ kho lÆ°u (không dùng trên các băng ghi âm mag!)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "thá»­ nhãn khối tin kho lÆ°u rồi thoát" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "Từ khóa bổ nghÄ©a thao tác:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "Ä‘iá»u khiển các tập tin thÆ°a thá»›t má»™t cách có hiệu quả" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" -msgstr "CHÃNH[.PHỤ]" +msgstr "CHÃNH[.PHỤ] " -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" -msgstr "đặt phiên bản của định dạng sparse cần dùng (ngụ ý « --sparse »)" +msgstr "đặt phiên bản của định dạng sparse cần dùng (ngụ ý “--sparseâ€)" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "Ä‘iá»u khiển sao lÆ°u incremental có định dạng GNU cÅ©" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "Ä‘iá»u khiển sao lÆ°u incremental có định dạng GNU má»›i" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "cấp đổ cho kho lÆ°u liệt kê tăng dần được tạo" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "đừng thoát vá»›i giá trị khác không trên tập tin không thể Ä‘á»c" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1520,452 +1536,466 @@ msgid "" msgstr "" "chỉ thá»±c hiện trên lần xuất hiện thứ Sá» của má»—i tập tin trong kho lÆ°u. Tùy " "chá»n này chỉ có ý nghÄ©a khi kết hợp vá»›i má»™t trong những câu lệnh con:\n" -" --delete\t\txoá\n" -" --diff\t\tkhác biệt\n" -" --extract \tgiải nén\n" -" --list \t\tliệt kê\n" -"và khi Ä‘Æ°a ra má»™t danh sách tập tin hoặc trên dòng lệnh hoặc qua tùy chá»n « -" -"T ».\n" +" --delete xoá\n" +" --diff khác biệt\n" +" --extract rút trích\n" +" --list liệt kê\n" +"và khi Ä‘Æ°a ra má»™t danh sách tập tin hoặc trên dòng lệnh hoặc qua tùy chá»n “-" +"Tâ€.\n" "Mặc định Sá» có giá trị bằng 1." -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "có thể tìm nÆ¡i trong kho lÆ°u" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "không thể tìm nÆ¡i trong kho lÆ°u" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "đừng kiểm tra số thứ tá»± thiết bị khi tạo kho nén dần" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" -msgstr "kiểm tra số thứ tá»± thiết bị khi tạo kho nén dần" +msgstr "kiểm tra số thứ tá»± thiết bị khi tạo kho lÆ°u tăng dần" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "Äiá»u khiển ghi đè:" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "thá»­ kiểm tra kho lÆ°u sau khi ghi nó" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "xóa bá» các tập tin sau khi thêm chúng vào kho lÆ°u" -#: src/tar.c:471 -#, fuzzy +#: src/tar.c:485 msgid "don't replace existing files when extracting, treat them as errors" -msgstr "không thay thế những tập tin đã có khi giải phóng" +msgstr "" +"khi rút trích thì không thay thế những tập tin đã có, mà coi đó là các lá»—i" -#: src/tar.c:474 -#, fuzzy +#: src/tar.c:488 msgid "don't replace existing files when extracting, silently skip over them" -msgstr "không thay thế những tập tin đã có khi giải phóng" +msgstr "" +"khi rút trích thì không thay thế những tập tin đã có, chỉ âm thầm bá» qua " +"chúng" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "không thay thế những tập tin đã có mà má»›i hÆ¡n bản sao trong kho lÆ°u" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" -msgstr "ghi đè lên những tập tin đã có khi giải phóng" +msgstr "ghi đè lên những tập tin đã có khi rút trích" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" -msgstr "xóa bá» quyá»n Æ°u tiên của má»—i tập tin để giải phóng và ghi đè lên nó" +msgstr "xóa bá» quyá»n Æ°u tiên của má»—i tập tin để rút trích và ghi đè lên nó" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" -msgstr "xóa sạch quyá»n Æ°u tiên trong cây thÆ° mục để giải phóng thÆ° mục" +msgstr "xóa sạch quyá»n Æ°u tiên trong cây thÆ° mục để rút trích thÆ° mục" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "bảo quản dữ liệu mêta của các thÆ° mục đã có" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "" -"ghi đè lên siêu dữ liệu của những thÆ° mục đã có khi giải phóng (mặc định)" +"ghi đè lên siêu dữ liệu của những thÆ° mục đã có khi rút trích (mặc định)" -#: src/tar.c:490 -#, fuzzy +#: src/tar.c:504 msgid "preserve existing symlinks to directories when extracting" -msgstr "ghi đè lên những tập tin đã có khi giải phóng" +msgstr "bảo tồn liên kết má»m đến các thÆ° mục sẵn có khi rút trích" + +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "TMỤC" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" -#: src/tar.c:496 +#: src/tar.c:513 msgid "Select output stream:" -msgstr "Chá»n luồng xuất:" +msgstr "Chá»n luồng dữ liệu xuất:" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" -msgstr "giải phóng tập tin ra đầu ra tiêu chuẩn" +msgstr "rút trích tập tin ra đầu ra tiêu chuẩn" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" -msgstr "CÂU LỆNH" +msgstr "LỆNH" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" -msgstr "gá»­i các tập tin đã giải nén qua ống dẫn cho chÆ°Æ¡ng trình khác" +msgstr "gá»­i các tập tin đã rút trích qua ống dẫn cho chÆ°Æ¡ng trình khác" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "bá» qua mã thoát của tiến trình con" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "xá»­ lý mã thoát khác số không của tiến trình con nhÆ° lá»—i" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "Äiá»u khiển thuá»™c tính tập tin:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "bắt buá»™c dùng TÊN làm ngÆ°á»i sở hữu cho những tập tin thêm vào" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "bắt buá»™c dùng TÊN làm nhóm sở hữu cho những tập tin thêm vào" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "NGÀY-CỦA-TẬP-TIN" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" -msgstr "đặt từ DATE-OR-FILE thá»i gian mtime cho các tập tin đã thêm" +msgstr "đặt từ NGÀY-CỦA-TẬP-TIN thá»i gian mtime cho các tập tin đã thêm" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" -msgstr "THAY Äá»”I" +msgstr "TH.Äá»”I" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" -msgstr "bắt buá»™c THAY Äá»”I chế Ä‘á»™ (tượng trÆ°ng) cho những tập tin thêm vào" +msgstr "bắt buá»™c THAY_Äá»”I chế Ä‘á»™ (ký hiệu) cho những tập tin thêm vào" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" -msgstr "PHƯƠNG PHÃP" +msgstr "PHƯƠNG_THỨC" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " "place (METHOD='system')" msgstr "" "bảo tồn các thá»i gian truy cập của tập tin đã đổ, hoặc bằng cách phục hồi " -"thá»i gian sau khi Ä‘á»c (PHƯƠNG PHÃP='replace'; mặc định), hoặc bằng cách " -"không đặt thá»i gian nhÆ° vậy (PHƯƠNG PHÃP='system')" +"thá»i gian sau khi Ä‘á»c (PHƯƠNG_THỨC=“replaceâ€; mặc định), hoặc bằng cách " +"không đặt thá»i gian nhÆ° vậy (PHƯƠNG_THỨC=“systemâ€)" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" -msgstr "không giải phóng thá»i gian sá»­a đổi của tập tin" +msgstr "không rút trích thá»i gian sá»­a đổi của tập tin" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" msgstr "" -"thá»­ giải phóng tập tin cùng quyá»n sở hữu vá»›i tập tin trong kho lÆ°u (mặc định " +"thá»­ rút trích tập tin cùng quyá»n sở hữu vá»›i tập tin trong kho lÆ°u (mặc định " "cho siêu ngÆ°á»i dùng)" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "" -"giải phóng tập tin dÆ°á»›i tên ngÆ°á»i dùng riêng (mặc định cho ngÆ°á»i dùng bình " +"rút trích tập tin dÆ°á»›i tên ngÆ°á»i dùng riêng (mặc định cho ngÆ°á»i dùng bình " "thÆ°á»ng)" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "luôn luôn sá»­ dụng số cho tên ngÆ°á»i dùng/nhóm" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "" -"cÅ©ng giải nén thông tin vá» quyá»n truy cập tập tin (mặc định cho siêu ngÆ°á»i " +"cÅ©ng rút trích thông tin vá» quyá»n truy cập tập tin (mặc định cho siêu ngÆ°á»i " "dùng)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "" -"áp dụng umask của ngÆ°á»i dùng khi giải nén quyá»n truy cập ra từ kho lÆ°u (mặc " +"áp dụng umask của ngÆ°á»i dùng khi rút trích quyá»n truy cập ra từ kho lÆ°u (mặc " "định cho ngÆ°á»i dùng bình thÆ°á»ng)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" +"các đối số thành viên được liệt kê cùng thứ tá»± vá»›i các tập tin trong kho lÆ°u" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "giống nhÆ° khi có hai tùy chá»n -p và -s" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "" -"hoãn đến kết thúc tiến trình giải nén việc đặt thá»i gian sá»­a đổi và quyá»n " -"truy cập các thÆ° mục đã giải nén" +"hoãn đến kết thúc tiến trình rút trích việc đặt thá»i gian sá»­a đổi và quyá»n " +"truy cập các thÆ° mục đã rút trích" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" -msgstr "hủy hiệu ứng của tùy chá»n « --delay-directory-restore »" +msgstr "hủy hiệu ứng của tùy chá»n “--delay-directory-restoreâ€" -#: src/tar.c:554 -#, fuzzy +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 msgid "Handling of extended file attributes:" -msgstr "Äiá»u khiển thuá»™c tính tập tin:" +msgstr "Äiá»u khiển thuá»™c tính tập tin mở rá»™ng:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" -msgstr "" +msgstr "Bật há»— trợ các thuá»™c tính mở rá»™ng" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" -msgstr "" +msgstr "Tắt há»— trợ các thuá»™c tính mở rá»™ng" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" -msgstr "" +msgstr "MẶT_NẠ" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" -msgstr "" +msgstr "chỉ định mẫu bao gồm cho khóa “xattrâ€" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" -msgstr "" +msgstr "chỉ định mẫu loại trừ cho khóa “xattrâ€" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" -msgstr "" +msgstr "Bật há»— trợ ngữ cảnh SELinux" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" -msgstr "" +msgstr "Tắt há»— trợ ngữ cảnh SELinux" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" -msgstr "" +msgstr "Bật há»— trợ “POSIX ACLsâ€" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" -msgstr "" +msgstr "Tắt há»— trợ “POSIX ACLsâ€" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "Lá»±a chá»n và chuyển đổi thiết bị:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" -msgstr "LƯU TRá»®" +msgstr "KHO-LƯU" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" -msgstr "sá»­ dụng tập tin kho lÆ°u hoặc thiết bị LƯU TRá»®" +msgstr "sá»­ dụng tập tin kho lÆ°u hoặc thiết bị KHO_LƯU" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "tập tin kho lÆ°u là cục bá»™ thậm chí nếu có má»™t dấu hai chấm" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "sá»­ dụng CÂU LỆNH rmt Ä‘Æ°a ra thay cho rmt" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "sá»­ dụng CÂU LỆNH từ xa thay cho rsh" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" -msgstr "chỉ ra ổ và mật Ä‘á»™ ghi dữ liệu" +msgstr "chỉ ra ổ Ä‘Ä©a và mật Ä‘á»™ ghi dữ liệu" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" -msgstr "tạo/liệt kê/giải phóng kho lÆ°u nhiá»u khối" +msgstr "tạo/liệt kê/rút trích kho lÆ°u nhiá»u khối" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" -msgstr "thay băng từ (tape) sau khi ghi Sá» X 1024 byte" +msgstr "thay băng từ (tape) sau khi ghi Sá» x 1024 byte" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "chạy script tại cuối má»—i băng ghi âm (có nghÄ©a -M)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" -msgstr "sá»­ dụng/cập nhật số thứ tá»± khối trong TẬP TIN" +msgstr "sá»­ dụng/cập nhật số thứ tá»± khối trong TẬP-TIN" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "Khối của thiết bị:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" -msgstr "KHá»I" +msgstr "KHá»I " -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" -msgstr "KHá»I X 512 byte cho má»—i bản ghi" +msgstr "KHá»I x 512 byte cho má»—i bản ghi" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" -msgstr "Sá» byte cho má»—i mục ghi, bá»™i số cho 512" +msgstr "Sá» byte cho má»—i bản ghi, bá»™i số của 512" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "lá» Ä‘i những khối không (zero) trong kho lÆ°u (có nghÄ©a EOF)" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "đặt khối lại khi chúng ta Ä‘á»c (cho Ä‘Æ°á»ng ống 4.2BSD)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "Lá»±a chá»n định dạng kho lÆ°u:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" -msgstr "ÄỊNH DẠNG" +msgstr "Ä.DẠNG" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "tạo lÆ°Æ° trữ vá»›i định dạng Ä‘Æ°a ra" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "ÄỊNH DẠNG là má»™t trong số sau:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "định dạng tar V7 cÅ©" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "định dạng GNU theo nhÆ° tar <= 1.12" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "định dạng tar GNU 1.13.x" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" -msgstr "định dạng PoSIX 1003.1-1988 (ustar)" +msgstr "định dạng POSIX 1003.1-1988 (ustar)" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "định dạng POSIX 1003.1-2001 (pax)" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" -msgstr "bằng pax" +msgstr "giống nhÆ° pax" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" -msgstr "giống nhÆ° --format=v7" +msgstr "giống nhÆ° “--format=v7â€" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" -msgstr "giống nhÆ° --format=posix" +msgstr "giống nhÆ° “--format=posixâ€" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "từ_khoá[[:]=giá_trị][,từ_khoá[[:]=giá_trị]]..." -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "từ khóa Ä‘iá»u khiển pax" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" -msgstr "VÄ‚N BẢN" +msgstr "VÄ‚N_BẢN" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "" -"tạo kho lÆ°u vá»›i tên khối tin VÄ‚N BẢN. Tại thá»i Ä‘iểm liệt kê/giải phóng, sá»­ " -"dụng VÄ‚N BẢN làm mẫu glob cho tên khối tin" +"tạo kho lÆ°u vá»›i tên khối tin VÄ‚N_BẢN; tại thá»i Ä‘iểm liệt kê/rút trích, sá»­ " +"dụng VÄ‚N_BẢN làm mẫu glob cho tên khối tin" -#: src/tar.c:660 +#: src/tar.c:684 msgid "Compression options:" msgstr "Tùy chá»n nén:" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "dùng hậu tố kho lÆ°u để xác định chÆ°Æ¡ng trình nén" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "không nên dùng hậu tố kho lÆ°u để xác định chÆ°Æ¡ng trình nén" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" -msgstr "TRÃŒNH" +msgstr "PMỀM" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "lá»c qua chÆ°Æ¡ng TRÃŒNH (phải chấp nhận -d)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "Lá»±a chá»n tập tin ná»™i bá»™:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "" -"thêm vào kho lÆ°u TẬP TIN đã cho (có ích nếu tên nó bắt đầu vá»›i dấu gạch)" - -#: src/tar.c:687 -msgid "DIR" -msgstr "THƯ MỤC" +"thêm vào kho lÆ°u TẬP-TIN đã cho (có ích nếu tên nó bắt đầu vá»›i dấu gạch)" -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "thay đổi tá»›i thÆ° mục THƯ MỤC" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" -msgstr "lấy các tên tập tin cần giải phóng hay tạo từ TẬP TIN" +msgstr "lấy các tên tập tin cần rút trích hay tạo từ TẬP-TIN" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "-T Ä‘á»c tên kết thúc vô hiệu lá»±c, tắt -C" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" -msgstr "tắt hiệu ứng của tùy chá»n « --null » Ä‘i trÆ°á»›c" +msgstr "tắt hiệu ứng của tùy chá»n “--null†đi trÆ°á»›c" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" -msgstr "hủy trích dẫn các tên tập tin được Ä‘á»c bằng « -T » (mặc định)" +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" +msgstr "hủy trích dẫn các tên tập tin được Ä‘á»c bằng “-T†(mặc định)" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" -msgstr "đừng hủy trích dẫn các tên tập tin được Ä‘á»c bằng « -T »" +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" +msgstr "đừng hủy trích dẫn các tên tập tin được Ä‘á»c bằng “-Tâ€" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "MẪU" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "loại trừ những tập tin tÆ°Æ¡ng ứng vá»›i MẪU" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" -msgstr "loại trừ những mẫu liệt kê trong TẬP TIN" +msgstr "loại trừ những mẫu liệt kê trong TẬP-TIN" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" @@ -1973,194 +2003,203 @@ msgstr "" "loại trừ ná»™i dung của thÆ° mục chứa thẻ ghi nhá»› tạm CACHEDIR.TAG, trừ tập tin " "thẻ chính nó" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "" "loại trừ má»i thứ Ä‘á»u nằm dÆ°á»›i thÆ° mục chứa thẻ ghi nhá»› tạm CACHEDIR.TAG" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "loại trừ thÆ° mục chứa thẻ ghi nhá»› tạm CACHEDIR.TAG" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" -msgstr "loại trừ ná»™i dung của thÆ° mục chứa TẬP TIN, trừ TẬP TIN chính nó" +msgstr "loại trừ ná»™i dung của thÆ° mục chứa TẬP-TIN, trừ TẬP-TIN chính nó" + +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" -#: src/tar.c:715 +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" -msgstr "loại trừ má»i thứ Ä‘á»u nằm dÆ°á»›i thÆ° mục chứa TẬP TIN" +msgstr "loại trừ má»i thứ Ä‘á»u nằm dÆ°á»›i thÆ° mục chứa TẬP-TIN" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" -msgstr "loại trừ thÆ° mục chứa TẬP TIN" +msgstr "loại trừ thÆ° mục chứa TẬP-TIN" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" -msgstr "loại trừ thÆ° mục của hệ thống Ä‘iá»u khiển phiên bản (v.d. « .svn »)" +msgstr "loại trừ thÆ° mục của hệ thống Ä‘iá»u khiển phiên bản (v.d. “.svnâ€)" + +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" -#: src/tar.c:721 +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "loại trừ tập tin kiểu sao lÆ°u và khoá" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "tránh sá»± giảm dần má»™t cách tá»± Ä‘á»™ng trong các thÆ° mục" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "nằm trong hệ thống tập tin ná»™i bá»™ khi tạo kho lÆ°u" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "đệ quy vào các thÆ° mục (mặc định)" -#: src/tar.c:729 -#, fuzzy +#: src/tar.c:761 msgid "don't strip leading '/'s from file names" -msgstr "đừng bá» `/' ở đầu tên tập tin" +msgstr "đừng bỠ“/†ở đầu tên tập tin" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" -msgstr "theo liên kết tượng trÆ°ng; kho lÆ°u và đổ tập tin tá»›i đó nó chỉ" +msgstr "theo liên kết má»m; kho lÆ°u và đổ tập tin tá»›i đó nó chỉ" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "theo liên kết cứng; kho lÆ°u và đổ tập tin tá»›i đó nó chỉ" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" -msgstr "TÊN-THÀNH-VIÊN" +msgstr "TÊN-TH.VIÊN" -#: src/tar.c:735 -#, fuzzy +#: src/tar.c:767 msgid "begin at member MEMBER-NAME when reading the archive" -msgstr "bắt đầu tại thành viên TÊN-THÀNH-VIÊN trong kho lÆ°u" +msgstr "bắt đầu tại thành viên TÊN-THÀNH-VIÊN khi Ä‘á»c kho lÆ°u" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "chỉ chứa những tập tin má»›i hÆ¡n NGÀY-CỦA-TẬP-TIN" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "NGÀY" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "so sánh ngày và thá»i gian chỉ khi dữ liệu thay đổi" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" -msgstr "ÄIỀU KHIỂN" +msgstr "Ä.KHIỂN" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "sao lÆ°u trÆ°á»›c khi xóa, chá»n phiên bản ÄIỀU KHIỂN" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "CHUá»–I" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" -"sao lÆ°u trÆ°á»›c khi xóa, ghi đè hậu tố thông thÆ°á»ng ('~' trừ khi ghi đè bằng " +"sao lÆ°u trÆ°á»›c khi xóa, ghi đè hậu tố thông thÆ°á»ng (“~†trừ khi ghi đè bằng " "biến môi trÆ°á»ng SIMPLE_BACKUP_SUFFIX)" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "Chuyển dạng tên tập tin:" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" -msgstr "bá» Ä‘i Sá» thành phần đứng đầu ra tên tập tin khi giải nén" +msgstr "bá» Ä‘i Sá» thành phần đứng đầu ra tên tập tin khi rút trích" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" -msgstr "BIỂU THỨC" +msgstr "BIỂU-THỨC" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" -msgstr "dùng « sed replace BIỂU THỨC » để chuyển dạng tên tập tin" +msgstr "dùng “sed replace BIỂU THỨC†để chuyển dạng tên tập tin" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "" "Tùy chá»n khá»›p tên tập tin (có tác Ä‘á»™ng mẫu kiểu cả hai loại trừ và bao gồm):" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" -msgstr "không phân biệt chữ hoa/thÆ°á»ng" +msgstr "không phân biệt HOA/thÆ°á»ng" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "mẫu tÆ°Æ¡ng ứng vá»›i bắt đầu tên tập tin" -#: src/tar.c:767 -#, fuzzy +#: src/tar.c:799 msgid "patterns match after any '/' (default for exclusion)" -msgstr "mẫu tÆ°Æ¡ng ứng sau bất kỳ / nào (mặc định để loại trừ)" +msgstr "mẫu khá»›p sau bất kỳ “/†nào (mặc định để loại trừ)" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" -msgstr "khá»›p có phân biệt chữ hoa/ thÆ°á»ng (mặc định)" +msgstr "khá»›p mẫu phân biệt HOA/ thÆ°á»ng (mặc định)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "dùng ký tá»± đại diện (mặc định để loại trừ)" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" -msgstr "khá»›p chuá»—i nghÄ©a chữ" +msgstr "khá»›p đúng nguyên văn" -#: src/tar.c:775 -#, fuzzy +#: src/tar.c:807 msgid "wildcards do not match '/'" -msgstr "ký tá»± đại diện không tÆ°Æ¡ng ứng '/'" +msgstr "ký tá»± đại diện không khá»›p “/â€" -#: src/tar.c:777 -#, fuzzy +#: src/tar.c:809 msgid "wildcards match '/' (default for exclusion)" -msgstr "ký tá»± đại diện tÆ°Æ¡ng ứng '/' (mặc định để loại trừ)" +msgstr "ký tá»± đại khá»›p “/†(mặc định để loại trừ)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "Dữ liệu kết quả có tính thông tin:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" -msgstr "liệt kê má»™t cách tỉ mỉ những tập tin được tiến hành" +msgstr "liệt kê má»™t cách tỉ mỉ những tập tin được xá»­ lý" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" -msgstr "TỪ_KHOÃ" +msgstr "T.KHOÃ" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "Ä‘iá»u khiển cảnh báo" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" -msgstr "hiển thị thông báo vá» tiến triển sau má»—i mục ghi thứ Sá» (mặc định 10)" +msgstr "hiển thị thông báo vá» tiến triển sau má»—i bản ghi thứ Sá» (mặc định 10)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" -msgstr "HÀNH_ÄỘNG" +msgstr "H.ÄỘNG" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" -msgstr "thá»±c hiện HÀNH_ÄỘNG này ở má»—i Ä‘iểm kiểm" +msgstr "thá»±c hiện HÀNH_ÄỘNG này ở má»—i Ä‘iểm kiểm tra" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "in ra má»™t thông báo nếu không phải tất cả các liên kết được dump" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" -msgstr "TÃN HIỆU" +msgstr "T.HIỆU" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2171,425 +2210,411 @@ msgstr "" "có đối số thì in ra tổng số byte khi nhận được TÃN HIỆU này; tín hiệu được " "phép:\n" "SIGHUP, SIGQUIT, SIGINT, SIGUSR1, SIGUSR2;\n" -"cÅ©ng chấp nhận tên không có tiá»n tố « SIG »." +"cÅ©ng chấp nhận tên không có tiá»n tố “SIGâ€;" -#: src/tar.c:802 +#: src/tar.c:834 msgid "print file modification times in UTC" msgstr "in ra giá» sá»­a đổi tập tin theo UTC" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "in ra giá» tập tin đến Ä‘á»™ phân giải đầy đủ" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" -msgstr "gá»­i kết quả chi tiết tá»›i TẬP TIN" +msgstr "gá»­i kết quả chi tiết tá»›i TẬP-TIN" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" -msgstr "hiên thị số thứ tá»± khối trong kho lÆ°u vá»›i má»—i thông báo" +msgstr "hiển thị số thứ tá»± khối trong kho lÆ°u vá»›i má»—i thông báo" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "há»i xác nhận trÆ°á»›c má»—i hành Ä‘á»™ng" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "hiển thị các giá trị mặc định của tar" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" -msgstr "" +msgstr "hiển thị vùng hợp lệ cho trÆ°á»ng “snapshot-fileâ€" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "" -"khi liệt kê hay giải phóng, liệt kê má»—i thÆ° mục không tÆ°Æ¡ng ứng vá»›i tiêu chí " +"khi liệt kê hay rút trích, liệt kê má»—i thÆ° mục không tÆ°Æ¡ng ứng vá»›i tiêu chí " "tìm kiếm" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "hiển thị các tên tập tin hay kho lÆ°u sau khi chuyển dạng" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" -msgstr "KIỂU DÃNG" +msgstr "KDÃNG" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "" "đặt kiểu dáng trích dẫn tên; xem dÆ°á»›i để tìm các giá trị KIỂU DÃNG hợp lệ" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "cÅ©ng trích dẫn các ký tá»± của CHUá»–I" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "tắt trích dẫn các ký tá»± của CHUá»–I" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "Tùy chá»n tÆ°Æ¡ng thích:" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "" -"khi tạo, giống nhÆ° « --old-archive »\n" -"khi giải phóng, giống nhÆ° « --no-same-owner »" +"khi tạo, giống nhÆ° “--old-archiveâ€\n" +"khi rút trích, giống nhÆ° “--no-same-ownerâ€" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "Những tùy chá»n khác:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "tắt sá»­ dụng má»™t số tùy chá»n có thể gây tai hại" -#: src/tar.c:978 -#, fuzzy +#: src/tar.c:1010 msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" -msgstr "Chỉ cho phép Ä‘Æ°a ra má»™t tùy chá»n « -Acdtrux » hay « --test-label »" +msgstr "" +"Chỉ cho phép Ä‘Æ°a ra má»™t tùy chá»n “-Acdtruxâ€, “--delete†hoặc “--test-labelâ€" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "Mâu thuẫn giữa các tùy chá»n nén" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "Không rõ tên tín hiệu: %s" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "Không tìm thấy tập tin mẫu ngày tháng" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "Äang thay thế %s cho dạng ngày tháng không rõ %s" -#: src/tar.c:1108 -#, fuzzy, c-format +#: src/tar.c:1140 +#, c-format msgid "Option %s: Treating date '%s' as %s" -msgstr "Tùy chá»n %s: Ä‘ang xá»­ lý ngày tháng « %s » nhÆ° %s" +msgstr "Tùy chá»n %s: Äang xá»­ lý ngày tháng “%s†nhÆ° là %s" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "lá»c kho lÆ°u qua %s" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" -msgstr "Các đối số thích hợp vá»›i tùy chá»n « --quoting-style »:" +msgstr "Các đối số thích hợp vá»›i tùy chá»n “--quoting-styleâ€:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" msgstr "" "\n" -"tar *này* mặc định tá»›i:\n" +"tar *này* mặc định dùng:\n" -#: src/tar.c:1295 -#, fuzzy +#: src/tar.c:1330 msgid "Invalid owner or group ID" -msgstr "Chủ sở hữu không đúng" +msgstr "ID của chủ sở hữu hay nhóm không đúng" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "Nhân tố khối không đúng" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" -msgstr "Chiá»u dài băng ghi âm không đúng" +msgstr "Chiá»u dài băng từ không đúng" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" -msgstr "Sai đặt giá trị cấp tăng dần" +msgstr "Giá trị mức gia số không hợp lệ" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" -msgstr "Có nhiá»u ngày bắt đầu" +msgstr "Có nhiá»u hÆ¡n má»™t ngưỡng ngày tháng" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "Giá trị phiên bản sparse không hợp lệ" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" -msgstr "--atime-preserve='system' không được há»— trợ trên ná»n tảng này" +msgstr "--atime-preserve=“system†không được há»— trợ trên ná»n tảng này" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" -msgstr "giá trị « --checkpoint » không phải số nguyên" +msgstr "giá trị “--checkpoint†không phải số nguyên" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "ÄÆ°a ra chế Ä‘á»™ không đúng trên tùy chá»n" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "Số không đúng" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" msgstr "" -"Tùy chá»n « --preserve » bị phản đối, hãy sá»­ dụng tùy chá»n « --preserve-" -"permissions » « --preserve-order » để thay thế" +"Tùy chá»n “--preserve†đã cổ, hãy thay bằng tùy chá»n “--preserve-" +"permissionsâ€, “--preserve-orderâ€" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "Kích thÆ°á»›c bản ghi không đúng" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "Kích thÆ°á»›c bản ghi phải là bá»™i số của %d." -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "Số thứ tá»± của nguyên tố không đúng" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" -msgstr "Cho phép chỉ má»™t tùy chá»n « --to-command »" +msgstr "Cho phép chỉ má»™t tùy chá»n “--to-commandâ€" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" -msgstr "Tham số mật Ä‘á»™ dạng sai: %s" +msgstr "Tham số mật Ä‘á»™ sai dạng: %s" -#: src/tar.c:2133 -#, fuzzy, c-format +#: src/tar.c:2205 +#, c-format msgid "Unknown density: '%c'" -msgstr "Mật Ä‘á»™ không rõ: « %c »" +msgstr "Không hiểu mật Ä‘á»™: “%câ€" -#: src/tar.c:2150 -#, fuzzy, c-format +#: src/tar.c:2222 +#, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" -msgstr "tar *này* không há»— trợ tùy chá»n `-[0-7][lmh]'" +msgstr "tar *này* không há»— trợ tùy chá»n “-[0-7][lmh]â€" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." -msgstr "[TẬP TIN]..." +msgstr "[TẬP-TIN]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 #, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "tùy chá»n “--%s†không được dùng cùng vá»›i %s" + +#: src/tar.c:2389 +#, c-format msgid "Old option '%c' requires an argument." -msgstr "Tùy chá»n cÅ© `%c' yêu cầu má»™t tham số." +msgstr "Tùy chá»n cÅ© “%c†yêu cầu má»™t tham số." -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" -msgstr "--occurrence không có giá trị khi không Ä‘Æ°a ra má»™t danh sách tập tin" +msgstr "“--occurrence†không có giá trị khi không Ä‘Æ°a ra má»™t danh sách tập tin" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "--occurrence không được sá»­ dụng trong chế Ä‘á»™ thao tác đã yêu cầu" - -#: src/tar.c:2408 -#, fuzzy +#: src/tar.c:2490 msgid "Multiple archive files require '-M' option" -msgstr "Tập tin nhiá»u kho lÆ°u yêu cầu tùy chá»n `-M'" +msgstr "Tập tin nhiá»u kho lÆ°u yêu cầu tùy chá»n “-Mâ€" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "Không thể kết hợp --listed-incremental vá»›i --newer" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" -msgstr "Tùy chá»n « --level » vô ích mà không có « --listed-incremental »" +msgstr "Tùy chá»n “--level†vô ích nếu không có “--listed-incrementalâ€" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "%s: Nhãn khối quá dài (giá»›i hạn là %lu byte)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "Không thể kiểm tra kho lÆ°u nhiá»u khối" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "Không thể kiểm tra kho lÆ°u đã nén" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "Không thể dùng mẫu (pattern) %s" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "Không thể sá»­ dụng kho lÆ°u nhiá»u khối đã nén" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "Không thể ghép nối các kho nén" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" -msgstr "--pax-option chỉ dùng được trên kho lÆ°u POSIX" +msgstr "“--pax-option†chỉ dùng được trên kho lÆ°u POSIX" -#: src/tar.c:2478 -#, fuzzy +#: src/tar.c:2560 msgid "--acls can be used only on POSIX archives" -msgstr "--pax-option chỉ dùng được trên kho lÆ°u POSIX" +msgstr "“--acls†chỉ dùng được trên kho lÆ°u POSIX" -#: src/tar.c:2483 -#, fuzzy +#: src/tar.c:2565 msgid "--selinux can be used only on POSIX archives" -msgstr "--pax-option chỉ dùng được trên kho lÆ°u POSIX" +msgstr "“--selinux†chỉ dùng được trên kho lÆ°u POSIX" -#: src/tar.c:2488 -#, fuzzy +#: src/tar.c:2570 msgid "--xattrs can be used only on POSIX archives" -msgstr "--pax-option chỉ dùng được trên kho lÆ°u POSIX" +msgstr "“--xattrs†chỉ dùng được trên kho lÆ°u POSIX" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "Không thể dùng mẫu (pattern) %s" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" +msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "Chiá»u dài khối tin không thể nhá» hÆ¡n kích cỡ mục ghi" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "" -"Tùy chá»n « --preserve-order » không tÆ°Æ¡ng thích vá»›i « --listed-incremental »" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "Từ chối tạo má»™t kho lÆ°u trống rá»—ng" -#: src/tar.c:2565 -#, fuzzy +#: src/tar.c:2669 msgid "Options '-Aru' are incompatible with '-f -'" -msgstr "Các tùy chá»n `-Aru' không tÆ°Æ¡ng thích vá»›i `-f -'" +msgstr "Các tùy chá»n “-Aru†không tÆ°Æ¡ng thích vá»›i “-f -â€" -#: src/tar.c:2660 -#, fuzzy +#: src/tar.c:2766 msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" msgstr "" -"Bạn phải chỉ ra má»™t trong hai tùy chá»n « -Acdtrux » và « --test-label »" +"Bạn phải chỉ ra má»™t trong số các tùy chá»n “-Acdtruxâ€, “--delete†hoặc “--" +"test-labelâ€" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "Äang thoát vá»›i trạng thái thất bại do lá»—i xảy ra trÆ°á»›c" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s: Tập tin được rút ngắn %s byte" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "Từ khóa %s không rõ hoặc chÆ°a được thá»±c hiện" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" -msgstr "Nhãn thá»i gian ở ngoại phạm vi" +msgstr "Nhãn thá»i gian ở ngoại phạm vi cho phép" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" -msgstr "Không thể dùng mẫu (pattern) %s" +msgstr "Không thể dùng mẫu “%sâ€" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" -msgstr "Không thể ghi chèn lên từ khóa %s" +msgstr "Không thể ghi chèn lên từ khóa “%sâ€" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "Phần đầu mở rá»™ng dạng sai: thiếu chiá»u dài" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "Chiá»u dài phần đầu mở rá»™ng %*s ở ngoại phạm vi được phép" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "Phần đầu mở rá»™ng dạng sai: thiếu khoảng trắng ở sau chiá»u dài" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "Phần đầu mở rá»™ng bị lá»—i: thiếu dấu bằng" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "Phần đầu mở rá»™ng dạng sai: thiếu dòng má»›i" -#: src/xheader.c:740 -#, fuzzy, c-format +#: src/xheader.c:741 +#, c-format msgid "Ignoring unknown extended header keyword '%s'" -msgstr "Bá» qua từ khoá phần đầu mở rá»™ng không rõ « %s »" +msgstr "Bá» qua từ khoá phần đầu mở rá»™ng không rõ “%sâ€" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "Cặp từ khoá/giá trị đã tạo ra quá dài (từ khoá=%s, chiá»u dài=%s)" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" -msgstr "Phần đầu mở rá»™ng %s=%s ở ngoại phạm vi (%s..%s)" +msgstr "Phần đầu mở rá»™ng %s=%s nằm ngoài phạm vi (%s..%s)" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "Phần đầu mở rá»™ng dạng sai: %s=%s không hợp lệ" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "Phần đầu mở rá»™ng dạng sai: %s=%s thừa" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" -msgstr "" -"Phần đầu mở rá»™ng dạng sai: %s không hợp lệ: dấu giá»›i hạn không mong đợi %c" +msgstr "Phần đầu mở rá»™ng dạng sai: %s không hợp lệ: không cần dấu phân cách %c" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "Phần đầu mở rá»™ng dạng sai: %s không hợp lệ: số giá trị lẻ" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" -msgstr "%s: không phải quá hạn hợp lệ" +msgstr "%s: không phải thá»i gian chá» tối Ä‘a hợp lệ" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "%s: không rõ hành Ä‘á»™ng Ä‘iểm kiểm" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "ghi" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "Ä‘á»c" @@ -2597,7 +2622,7 @@ msgstr "Ä‘á»c" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "Äiểm kiểm tra ghi %u" @@ -2606,7 +2631,7 @@ msgstr "Äiểm kiểm tra ghi %u" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "Äiểm kiểm tra Ä‘á»c %u" @@ -2625,30 +2650,30 @@ msgstr "Tùy chá»n tạo tập tin:" #: tests/genfile.c:128 tests/genfile.c:139 msgid "SIZE" -msgstr "KÃCH Cá» " +msgstr "Cá» " #: tests/genfile.c:129 msgid "Create file of the given SIZE" -msgstr "Tạo tập tin có KÃCH Cá»  đã cho" +msgstr "Tạo tập tin có KÃCH_Cá»  đã cho" #: tests/genfile.c:131 msgid "Write to file NAME, instead of standard output" -msgstr "Ghi vào tập tin TÊN, thay vào thiết bị gõ chuẩn" +msgstr "Ghi vào tập tin TÊN, thay cho đầu ra tiêu chuẩn" #: tests/genfile.c:133 msgid "Read file names from FILE" -msgstr "Äá»c các tên tập tin từ TẬP TIN" +msgstr "Äá»c các tên tập tin từ TẬP-TIN" #: tests/genfile.c:135 msgid "-T reads null-terminated names" -msgstr "-T Ä‘á»c tên kết thúc vô hiệu lá»±c" +msgstr "“-T†đá»c tên kết thúc vô hiệu lá»±c" #: tests/genfile.c:137 msgid "Fill the file with the given PATTERN. PATTERN is 'default' or 'zeros'" msgstr "" "Äiá»n vào tập tin bằng MẪU đã cho. MẪU là:\n" -" • default\t\tmặc định\n" -" • zeros\t\tcác số không" +" • default mặc định\n" +" • zeros các số không" #: tests/genfile.c:140 msgid "Size of a block for sparse file" @@ -2657,15 +2682,15 @@ msgstr "Kích cỡ của khối cho tập tin spare" #: tests/genfile.c:142 msgid "Generate sparse file. Rest of the command line gives the file map." msgstr "" -"Tạo ra tập tin sparse. Phần còn lại của dòng lệnh Ä‘Æ°a ra sÆ¡ đồ tập tin." +"Tạo ra tập tin sparse. Phần còn lại của dòng lệnh Ä‘Æ°a ra ánh xạ tập tin." #: tests/genfile.c:144 msgid "OFFSET" -msgstr "HIỆU Sá»" +msgstr "HIỆU_Sá»" #: tests/genfile.c:145 msgid "Seek to the given offset before writing data" -msgstr "Tìm nÆ¡i theo hiệu số đã cho trÆ°á»›c khi ghi dữ liệu" +msgstr "Di chuyển vị trí Ä‘á»c tá»›i hiệu số đã cho trÆ°á»›c khi ghi dữ liệu" #: tests/genfile.c:151 msgid "File statistics options:" @@ -2681,19 +2706,19 @@ msgstr "Tùy chá»n thá»±c hiện đồng thá»i:" #: tests/genfile.c:163 msgid "OPTION" -msgstr "TÙY_CHỌN" +msgstr "T.CHỌN" #: tests/genfile.c:164 msgid "" "Execute ARGS. Useful with --checkpoint and one of --cut, --append, --touch, " "--unlink" msgstr "" -"Thá»±c hiện các Äá»I_SỠđã cho. Có ích vá»›i « --checkpoint » (Ä‘iểm kiểm tra) và " -"má»™t của:\n" -" • --cut\t\tcất\n" -" • --append\tphụ thêm\n" -" • --touch\tsá»\n" -" • --unlink\tbá» liên kết" +"Thá»±c hiện các Äá»I_SỠđã cho. Có ích vá»›i “--checkpoint†(Ä‘iểm kiểm tra) và " +"má»™t trong số:\n" +" • --cut cắt\n" +" • --append nối thêm\n" +" • --touch chạm vào\n" +" • --unlink bá» liên kết" #: tests/genfile.c:167 msgid "Perform given action (see below) upon reaching checkpoint NUMBER" @@ -2701,7 +2726,7 @@ msgstr "Thá»±c hiện hành Ä‘á»™ng đã cho (xem dÆ°á»›i) khi tá»›i Ä‘iểm ki #: tests/genfile.c:170 msgid "Set date for next --touch option" -msgstr "Äặt ngày tháng cho tùy chá»n « -touch » kế tiếp" +msgstr "Äặt ngày tháng cho tùy chá»n “-touch†kế tiếp" #: tests/genfile.c:173 msgid "Display executed checkpoints and exit status of COMMAND" @@ -2713,25 +2738,25 @@ msgid "" "given by --checkpoint option is reached." msgstr "" "Các hành Ä‘á»™ng thá»±c hiện đồng thá»i; được thá»±c hiện khi tá»›i Ä‘iểm kiểm tra có " -"số được ghi rõ bằng tùy chá»n « --checkpoint »." +"số được ghi rõ bằng tùy chá»n “--checkpointâ€." #: tests/genfile.c:181 msgid "" "Truncate FILE to the size specified by previous --length option (or 0, if it " "is not given)" msgstr "" -"Cắt ngắn TẬP TIN thành kích cỡ được ghi rõ bằng tùy chá»n « --length » trÆ°á»›c " +"Cắt ngắn TẬP-TIN thành kích cỡ được ghi rõ bằng tùy chá»n “--length†trÆ°á»›c " "(không ghi rõ thì 0)" #: tests/genfile.c:185 msgid "Append SIZE bytes to FILE. SIZE is given by previous --length option." msgstr "" -"Phụ thêm KÃCH Cá»  byte vào TẬP TIN. KÃCH Cá»  được ghi rõ bằng tùy chá»n « --" -"length » trÆ°á»›c." +"Phụ thêm KÃCH_Cá»  byte vào TẬP-TIN. KÃCH_Cá»  được ghi rõ bằng tùy chá»n “--" +"length†trÆ°á»›c." #: tests/genfile.c:188 msgid "Update the access and modification times of FILE" -msgstr "Cập nhật các thá»i gian truy cập và sá»­a đổi của TẬP TIN" +msgstr "Cập nhật các thá»i gian truy cập và sá»­a đổi của TẬP-TIN" #: tests/genfile.c:191 msgid "Execute COMMAND" @@ -2754,7 +2779,7 @@ msgstr "Số nằm ngoài phạm vi cho phép: %s" #: tests/genfile.c:252 #, c-format msgid "Negative size: %s" -msgstr "Kích cỡ âm: %s" +msgstr "Kích cỡ bị âm: %s" #: tests/genfile.c:265 tests/genfile.c:569 #, c-format @@ -2774,7 +2799,7 @@ msgstr "đã tạo tập tin không phải thÆ°a thá»›t (sparse)" #: tests/genfile.c:361 #, c-format msgid "Error parsing number near `%s'" -msgstr "Lá»—i phân tích số gần « %s »" +msgstr "Lá»—i phân tích số gần “%sâ€" #: tests/genfile.c:367 #, c-format @@ -2783,13 +2808,13 @@ msgstr "Không rõ định dạng ngày tháng" #: tests/genfile.c:391 msgid "[ARGS...]" -msgstr "[Äá»I Sá»...]" +msgstr "[Ä.Sá»...]" #: tests/genfile.c:428 tests/genfile.c:468 tests/genfile.c:523 #: tests/genfile.c:673 tests/genfile.c:687 #, c-format msgid "cannot open `%s'" -msgstr "không thể mở « %s »" +msgstr "không thể mở “%sâ€" #: tests/genfile.c:434 msgid "cannot seek" @@ -2798,44 +2823,44 @@ msgstr "không thể tìm nÆ¡i" #: tests/genfile.c:451 #, c-format msgid "file name contains null character" -msgstr "tên tập tin chứa ký tá»± vô giá trị" +msgstr "tên tập tin chứa ký tá»± null" #: tests/genfile.c:518 #, c-format msgid "cannot generate sparse files on standard output, use --file option" msgstr "" -"không thể tạo ra tập tin sparse trên thiết bị gõ chuẩn: dùng tùy chá»n « --" -"file »" +"không thể tạo ra tập tin sparse trên thiết bị gõ chuẩn: dùng tùy chá»n “--" +"fileâ€" #: tests/genfile.c:596 #, c-format msgid "incorrect mask (near `%s')" -msgstr "mặt nạ không đúng (gần « %s »)" +msgstr "mặt nạ không đúng (gần “%sâ€)" #: tests/genfile.c:602 tests/genfile.c:635 #, c-format msgid "Unknown field `%s'" -msgstr "Không rõ trÆ°á»ng « %s »" +msgstr "Không rõ trÆ°á»ng “%sâ€" #: tests/genfile.c:662 #, c-format msgid "cannot set time on `%s'" -msgstr "không thể đặt thá»i gian trên « %s »" +msgstr "không thể đặt thá»i gian trên “%sâ€" #: tests/genfile.c:692 -#, fuzzy, c-format +#, c-format msgid "cannot truncate `%s'" -msgstr "không thể bá» liên kết « %s »" +msgstr "không thể cắt ngắn “%sâ€" #: tests/genfile.c:701 -#, fuzzy, c-format +#, c-format msgid "command failed: %s" -msgstr "Câu lệnh %s không thành công" +msgstr "Câu lệnh không thành công: %s" #: tests/genfile.c:706 #, c-format msgid "cannot unlink `%s'" -msgstr "không thể bá» liên kết « %s »" +msgstr "không thể bá» liên kết “%sâ€" #: tests/genfile.c:833 #, c-format @@ -2845,7 +2870,7 @@ msgstr "Lệnh đã thoát thành công\n" #: tests/genfile.c:835 #, c-format msgid "Command failed with status %d\n" -msgstr "Lệnh bị lá»—i vá»›i trạng thái %d\n" +msgstr "Lệnh bị lá»—i vá»›i trạng thái thoát %d\n" #: tests/genfile.c:839 #, c-format @@ -2870,13 +2895,20 @@ msgstr "Lệnh đã chấm dứt\n" #: tests/genfile.c:879 #, c-format msgid "--stat requires file names" -msgstr "--stat yêu cầu tên tập tin" +msgstr "“--stat†yêu cầu tên tập tin" -#~ msgid "Cannot get working directory" -#~ msgstr "Không lấy được thÆ° mục làm việc" +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "“--occurrence†không thể dùng cùng vá»›i %s" -#~ msgid "sort names to extract to match archive" -#~ msgstr "sắp xếp tên để giải phóng tá»›i kho lÆ°u tÆ°Æ¡ng ứng" +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "Không thể kết hợp “--listed-incremental†vá»›i “--newerâ€" + +#~ msgid "--verify cannot be used with %s" +#~ msgstr "không thể dùng “--verify†cùng vá»›i %s" + +#~ msgid "--preserve-order is not compatible with --listed-incremental" +#~ msgstr "" +#~ "Tùy chá»n “--preserve-order†không tÆ°Æ¡ng thích vá»›i “--listed-incrementalâ€" #~ msgid "Field too long while reading snapshot file" #~ msgstr "TrÆ°á»ng quá dài trong khi Ä‘á»c tập tin ảnh chụp" @@ -2885,14 +2917,20 @@ msgstr "--stat yêu cầu tên tập tin" #~ msgstr "Lá»—i Ä‘á»c trong tập tin ảnh chụp" #~ msgid "Unexpected field value in snapshot file" -#~ msgstr "Giá trị trÆ°á»ng không mong đợi trong tập tin ảnh chụp" +#~ msgstr "Gặp giá trị trÆ°á»ng không cần trong tập tin ảnh chụp" -#~ msgid "Extended header length is out of allowed range" -#~ msgstr "Chiá»u dài phần đầu mở rá»™ng ở ngoại phạm vi được phép" +#~ msgid "Cannot get working directory" +#~ msgstr "Không lấy được thÆ° mục làm việc" + +#~ msgid "sort names to extract to match archive" +#~ msgstr "sắp xếp tên để rút trích tá»›i kho lÆ°u tÆ°Æ¡ng ứng" #~ msgid "Invalid group" #~ msgstr "Nhóm không đúng" +#~ msgid "Extended header length is out of allowed range" +#~ msgstr "Chiá»u dài phần đầu mở rá»™ng ở ngoại phạm vi được phép" + #~ msgid "Cannot save working directory" #~ msgstr "Không thể ghi nhá»› thÆ° mục làm việc" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo index 5b8752d..42ea31f 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 07b6234..30fb430 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -5,12 +5,12 @@ # Rongjun Mu , 2004. # Ji ZhengYu , 2008, 2009, 2010, 2011. # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" "Project-Id-Version: tar 1.26\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" "PO-Revision-Date: 2011-04-28 20:42+0800\n" "Last-Translator: Ji ZhengYu \n" "Language-Team: Chinese (simplified) \n" @@ -99,7 +99,7 @@ msgstr "显示此帮助列表" msgid "give a short usage message" msgstr "显示简短的用法说明" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "å称" @@ -432,7 +432,7 @@ msgstr "GNU 软件的通用帮助: \n" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s：无法 %s" @@ -441,54 +441,54 @@ msgstr "%s：无法 %s" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s：警告：无法 %s" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s：无法将模å¼æ”¹ä¸º %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s：无法将所有æƒæ”¹ä¸º uid %lu，gid %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s：无法硬连接到 %s" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%1$s：读入 %3$lu 字节时，在 %2$s 字节处å‘生读错误" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" msgstr[0] "%1$s：警告：读入 %3$lu 字节时，在 %2$s 字节处å‘生读错误" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s：无法定ä½åˆ° %s" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s：警告：无法定ä½åˆ° %s" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s：无法创建到 %s 的符å·è¿žæŽ¥" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -586,8 +586,8 @@ msgstr "å‚数异常" msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "接å—远程程åºçš„命令æ“作ç£å¸¦æœº" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "NUMBER" @@ -595,10 +595,10 @@ msgstr "NUMBER" msgid "set debug level" msgstr "设定调试级别" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "FILE" @@ -620,101 +620,109 @@ msgstr "å‚数过多" msgid "Garbage command" msgstr "垃圾命令" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "它似乎ä¸åƒæ˜¯ä¸€ä¸ª tar 归档文件" -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" -msgstr "总计写入字节数" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" msgstr "总计读å–字节数" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "总计写入字节数" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "总计删除字节数：%s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(管é“)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "record_size 的无效值" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "未给出归档文件å" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "无法验è¯æ ‡å‡†è¾“å…¥/标准输出归档文件" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "归档被压缩。使用 %s 选项" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "无法更新压缩归档文件" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "处于ç£å¸¦çš„起点，现在退出" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "错误过多，退出" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "è®°å½•å¤§å° = %lu å—" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "归档中未对é½çš„å— (%lu 字节)s" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "无法倒回归档文件；如果没有 -i å¯èƒ½æ— æ³•è¯»å…¥å®ƒ" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek 未åœåœ¨è®°å½•è¾¹ç•Œå¤„" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s：包å«æ— æ•ˆçš„å·ç¼–å·" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "å·ç¼–å·æº¢å‡º" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "为 %2$s å‡†å¤‡å· #%1$d 并按回车：" -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "需得到用户应答时文件结æŸ" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "警告：归档文件ä¸å®Œæ•´" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -725,71 +733,71 @@ msgstr "" " q\t\t终止 tar\n" " y or newline\t继续æ“作\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! è¡ç”Ÿå‡ºä¸€ä¸ªå­ shell\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? 打å°æ­¤åˆ—表\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "没有新的å·ï¼›é€€å‡ºã€‚\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "未指定文件å。é‡è¯•ã€‚\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "无效输入。输入 ? 显示帮助。\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "%s 命令失败" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s 在本å·å¯èƒ½è¿žç»­: 头部包å«æˆªçŸ­çš„åå­—" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s 在本å·ä¸­ä¸è¿žç»­" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s 的大å°é”™è¯¯ (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "æ­¤å·æ¬¡åºæœ‰è¯¯ï¼ˆ%s - %s != %s）" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "å½’æ¡£æœªè¢«æ ‡è®°ä¸ºåŒ¹é… %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "å·æ ‡ %s ä¸åŒ¹é… %s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "%s: 文件å太长而无法贮存在 GNU 多å·å¤´ï¼Œå·²è¢«æˆªçŸ­" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "写æ“作未在记录边界处终止" @@ -799,16 +807,16 @@ msgid "Could only read %lu of %lu byte" msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "仅能读入 %2$lu 中的 %1$lu 个字节" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "内容ä¸åŒ" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "归档文件中异常的 EOF" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "文件类型ä¸åŒ" @@ -828,7 +836,7 @@ msgstr "Gid ä¸åŒ" msgid "Mod time differs" msgstr "修改时间ä¸åŒ" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "大å°ä¸åŒ" @@ -845,35 +853,35 @@ msgstr "符å·è¿žæŽ¥ä¸åŒ" msgid "Device number differs" msgstr "设备å·ä¸åŒ" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "校验" -#: src/compare.c:471 +#: src/compare.c:473 #, fuzzy, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "%s：未知的文件类型“%câ€ï¼Œä¸Žæ™®é€šæ–‡ä»¶ä¸åŒ" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "归档包å«å¸¦æœ‰è¢«ç§»é™¤å‰å¯¼å­—符的文件å。" -#: src/compare.c:533 +#: src/compare.c:535 msgid "Archive contains transformed file names." msgstr "归档中有文件被改å。" -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "ä½äºŽåŽŸå§‹æ–‡ä»¶ä¸­çš„验è¯å¯èƒ½å¤±è´¥ã€‚" -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "校验失败：检测到 %d 个无效的头" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "在 %s 处一个å•ç‹¬çš„零å—" @@ -918,55 +926,55 @@ msgid "%s: File shrank by %s byte; padding with zeros" msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "%sï¼šæ–‡ä»¶ç¼©å° %s 字节；用零填充" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s：文件在ä¸åŒçš„文件系统上；未输出" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "未输出内容" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s：未知的文件类型；忽略文件" -#: src/create.c:1549 +#: src/create.c:1551 #, c-format msgid "Missing links to %s." msgstr "缺少到 %s 的连接。" -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s: 文件未改å˜ï¼›æœªè¾“出" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s: 文件是归档文件；未输出" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "未输出目录" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s: 在我们读入文件时文件å‘生了å˜åŒ–" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s: 忽略套接字(socket)" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s: 忽略æƒé™" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "跳转到下一个头" @@ -1012,7 +1020,7 @@ msgstr "正试图将符å·è¿žæŽ¥å±•å¼€ä¸ºç¡¬è¿žæŽ¥" msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s：无法展开 -- 文件一直延伸至å¦ä¸€å·ä¸­" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" msgstr "异常的长å字头部" @@ -1056,250 +1064,250 @@ msgstr "%s：文件在ä¸åŒçš„文件系统上；未输出" msgid "%s: Directory has been renamed" msgstr "%s：目录已被改å" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "无效的时间戳" -#: src/incremen.c:1045 +#: src/incremen.c:1047 #, fuzzy msgid "Invalid modification time" msgstr "无效的修改时间(秒)" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "无效的修改时间(纳秒)" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "无效的设备å·" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "无效的 inode å·" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" msgstr "" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" msgstr "目录文件中异常的文件结尾(EOF)" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" msgstr "" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" msgstr "" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "缺少记录终止符" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "文件格å¼é”™è¯¯å¢žé‡" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "ä¸æ”¯æŒå¢žé‡æ ¼å¼ç‰ˆæœ¬: %" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "错误的 dumpdir: 需è¦â€œ%câ€ä½†å®žé™…为 %#3o" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "错误的 dumpdir: é‡å¤çš„“Xâ€" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "错误的 dumpdir: “Râ€ä¸­æœ‰ç©ºåå­—" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "错误的 dumpdir: “Râ€åŽæœªç´§æŽ¥ç€ç”¨â€œTâ€" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "错误的 dumpdir: “Tâ€ä¸­æœ‰ç©ºåå­—" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "错误的 dumpdir: 需è¦â€œ%câ€ä½†å®žé™…为数æ®ç»“å°¾" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "错误的 dumpdir: 从未用过“Xâ€" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "æ— æ³•é€šè¿‡æ¨¡æ¿ %s 创建临时目录" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s：未清除目录：无法 stat" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s: 目录在ä¸åŒçš„设备上: 未清除" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s：正在删除 %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s：无法删除" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s：忽略" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "å— %s：** ç©ºå— **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "å— %s：** æ–‡ä»¶ç»“æŸ **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "å— %s：" #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "头中需è¦æ•°å€¼ %s 处为空白符" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "归档的八进制值 %.*s 超出范围 %sï¼›å‡å®šä¸ºå…¶äºŒè¿›åˆ¶è¡¥ç " #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "归档八进制值 %.*s 超出 %s 的范围" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "归档包å«è¿‡æ—¶çš„ base-64 头" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "归档签署的 base-64 字符串 %s 超出范围 %s" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "归档的 base-256 值超出范围 %s" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "å½’æ¡£åŒ…å« %.*s 而需è¦æ•°å­—值 %s" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "归档值 %s 超出 %s 的范围 %s..%s" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " 连接到 %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " 未知的文件类型 %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--长连接--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--é•¿å--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--å·å¤´--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--从 %s 字节继续--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "正在创建目录：" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "å°† %s 改å为 %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s：无法é‡å‘½å为 %s" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "å°† %s çš„å字改回 %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s：文件在我们读入之å‰è¢«åˆ é™¤äº†" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "å­è¿›ç¨‹" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "进程内通é“" @@ -1313,7 +1321,7 @@ msgstr "%s 命令失败" msgid "%s: file list requested from %s already read from %s" msgstr "%s: 文件列表已ç»è¯»å–" -#: src/names.c:448 +#: src/names.c:448 src/checkpoint.c:274 #, fuzzy, c-format msgid "cannot split string '%s': %s" msgstr "无法设定“%sâ€çš„时间" @@ -1323,61 +1331,61 @@ msgstr "无法设定“%sâ€çš„时间" msgid "%s: file name read contains nul character" msgstr "%s: 读å–的文件åå«æœ‰ç©ºå­—符" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "文件å中所使用的字符匹é…模å¼" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "使用 --wildcards 打开模å¼åŒ¹é…，或是 --no-wildcards æ¥å…³é—­ä¹‹" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s：归档中找ä¸åˆ°" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s：没有在归档中找到需è¦çš„" -#: src/names.c:876 +#: src/names.c:879 #, c-format msgid "Archive label mismatch" msgstr "å½’æ¡£å·æ ‡ä¸åŒ¹é…" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "在文件列表中 -C 选项与 --listed-incremental 选项ä¸è®¸åˆç”¨" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "仅一个 -C 选项å…许与 --listed-incremental åˆç”¨" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "选项“-%sâ€å’Œâ€œ-%sâ€éƒ½éœ€è¦æ ‡å‡†è¾“出" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s：无效的归档格å¼" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "在ä¸å…¼å®¹çš„归档格å¼ä¸Šéœ€è¦ GNU 特å¾" -#: src/tar.c:255 +#: src/tar.c:264 #, fuzzy, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." msgstr "未知的引用形å¼â€˜%s’。å°è¯•ç”¨â€˜%s --quoting-style=help’获å–列表。" -#: src/tar.c:364 +#: src/tar.c:378 #, fuzzy msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " @@ -1398,7 +1406,7 @@ msgstr "" "件。\n" " tar -xf archive.tar # 展开归档文件 archive.tar 中的所有文件。\n" -#: src/tar.c:373 +#: src/tar.c:387 #, fuzzy msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1418,79 +1426,79 @@ msgstr "" " nil, existing 如果编å·å¤‡ä»½å­˜åœ¨åˆ™è¿›è¡Œç¼–å·å¤‡ä»½ï¼Œå¦åˆ™è¿›è¡Œç®€å•å¤‡ä»½\n" " never, simple 总是使用简å•å¤‡ä»½\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "主æ“作模å¼:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "列出归档内容" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "从归档中解出文件" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "创建一个新归档" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "找出归档和文件系统的差异" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "追加文件至归档结尾" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "仅追加比归档中副本更新的文件" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "追加 tar 文件至归档" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "从归档(éžç£å¸¦ï¼)中删除" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "测试归档å·æ ‡å¹¶é€€å‡º" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "æ“作修饰符:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "高效处ç†ç¦»æ•£æ–‡ä»¶" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "MAJOR[.MINOR]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "设置所用的离散格å¼ç‰ˆæœ¬(éšå« --sparse)" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "处ç†è€å¼çš„ GNU æ ¼å¼çš„增é‡å¤‡ä»½" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "处ç†æ–°å¼çš„ GNU æ ¼å¼çš„增é‡å¤‡ä»½" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "所创建的增é‡åˆ—表归档的输出级别" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "当é‡ä¸Šä¸å¯è¯»æ–‡ä»¶æ—¶ä¸è¦ä»¥éžé›¶å€¼é€€å‡º" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1501,130 +1509,138 @@ msgstr "" "extract 或是 --list 中的一个è”åˆä½¿ç”¨æ—¶ï¼Œæ­¤é€‰é¡¹æ‰æœ‰æ•ˆã€‚而且ä¸ç®¡æ–‡ä»¶åˆ—表是以命" "令行形å¼ç»™å‡ºæˆ–是通过 -T 选项指定的；NUMBER 值默认为 1" -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "å½’æ¡£å¯æ£€ç´¢" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "å½’æ¡£ä¸å¯æ£€ç´¢" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "当创建增é‡å½’档时ä¸è¦æ£€æŸ¥è®¾å¤‡å·" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "当创建增é‡å½’档时检查设备å·(默认)" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "é‡å†™æŽ§åˆ¶:" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "在写入以åŽå°è¯•æ ¡éªŒå½’æ¡£" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "在添加文件至归档åŽåˆ é™¤å®ƒä»¬" -#: src/tar.c:471 +#: src/tar.c:485 #, fuzzy msgid "don't replace existing files when extracting, treat them as errors" msgstr "解压时ä¸è¦æ›¿æ¢å­˜åœ¨çš„文件" -#: src/tar.c:474 +#: src/tar.c:488 #, fuzzy msgid "don't replace existing files when extracting, silently skip over them" msgstr "解压时ä¸è¦æ›¿æ¢å­˜åœ¨çš„文件" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "ä¸è¦æ›¿æ¢æ¯”归档中副本更新的已存在的文件" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "解压时é‡å†™å­˜åœ¨çš„文件" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "在解压è¦é‡å†™çš„文件之å‰å…ˆåˆ é™¤å®ƒä»¬" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "解压目录之å‰å…ˆæ¸…除目录层次" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "ä¿ç•™å·²å­˜åœ¨ç›®å½•çš„元数æ®" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "解压时é‡å†™å·²å­˜åœ¨ç›®å½•çš„元数æ®(默认)" -#: src/tar.c:490 +#: src/tar.c:504 #, fuzzy msgid "preserve existing symlinks to directories when extracting" msgstr "解压时é‡å†™å­˜åœ¨çš„文件" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "DIR" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "选择输出æµ:" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "解压文件至标准输出" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "COMMAND" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "将解压的文件通过管é“ä¼ é€è‡³å¦ä¸€ä¸ªç¨‹åº" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "忽略å­è¿›ç¨‹çš„退出代ç " -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "å°†å­è¿›ç¨‹çš„éžé›¶é€€å‡ºä»£ç è®¤ä¸ºå‘生错误" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "æ“作文件属性:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "强制将 NAME 作为所添加的文件的所有者" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "强制将 NAME 作为所添加的文件的组所有者" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "DATE-OR-FILE" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "从 DATE-OR-FILE 中为添加的文件设置 mtime" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "CHANGES" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "强制将所添加的文件(符å·)更改为æƒé™ CHANGES" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "METHOD" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " @@ -1633,487 +1649,507 @@ msgstr "" "在输出的文件上ä¿ç•™è®¿é—®æ—¶é—´ï¼Œè¦ä¹ˆé€šè¿‡åœ¨è¯»å–(默认 METHOD=‘replace’)åŽè¿˜åŽŸæ—¶é—´ï¼Œ" "è¦ä¸å°±ä¸è¦åœ¨ç¬¬ä¸€æ¬¡(METHOD=‘system’)设置时间" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "ä¸è¦è§£åŽ‹æ–‡ä»¶çš„修改时间" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" msgstr "å°è¯•è§£åŽ‹æ—¶ä¿æŒæ‰€æœ‰è€…关系一致(超级用户默认此项)" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "将文件解压为您所有(普通用户默认此项)" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "总是以数字代表用户/组的å称" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "解压文件æƒé™ä¿¡æ¯(默认åªä¸ºè¶…级用户æœåŠ¡)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "从归档中解压æƒé™æ—¶ä½¿ç”¨ç”¨æˆ·çš„掩ç ä½(默认为普通用户æœåŠ¡)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "与 -p å’Œ -s 一样" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "直到解压结æŸæ‰è®¾ç½®ä¿®æ”¹æ—¶é—´å’Œæ‰€è§£ç›®å½•çš„æƒé™" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "å–消 --delay-directory-restore 选项的效果" -#: src/tar.c:554 +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 #, fuzzy msgid "Handling of extended file attributes:" msgstr "æ“作文件属性:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" msgstr "" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" msgstr "" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" msgstr "" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" msgstr "" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" msgstr "" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" msgstr "" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" msgstr "" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" msgstr "" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "设备选择和切æ¢:" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "ARCHIVE" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "使用归档文件或 ARCHIVE 设备" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "å³ä½¿å½’档文件存在副本还是把它认为是本地归档" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "使用指定的 rmt COMMAND 代替 rmt" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "使用远程 COMMAND 代替 rsh" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "指定驱动器和压缩率" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "创建/列出/解压多å·å½’档文件" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "写入 NUMBER × 1024 字节åŽæ›´æ¢ç£å¸¦" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "在æ¯å·ç£å¸¦æœ€åŽè¿è¡Œè„šæœ¬(éšå« -M)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "使用/æ›´æ–° FILE 中的å·æ•°" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "设备分å—:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "BLOCKS" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "æ¯ä¸ªè®°å½• BLOCKS x 512 字节" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "æ¯ä¸ªè®°å½•çš„字节数 NUMBER，乘以 512" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "忽略归档中的零字节å—(å³æ–‡ä»¶ç»“å°¾)" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "读å–æ—¶é‡æ–°åˆ†å—(åªå¯¹ 4.2BSD 管é“有效)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "选择归档格å¼:" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "FORMAT" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "创建指定格å¼çš„å½’æ¡£" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "FORMAT 是以下格å¼ä¸­çš„一ç§:" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "old V7 tar æ ¼å¼" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "GNU æ ¼å¼ as per tar <= 1.12" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x æ ¼å¼" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) æ ¼å¼" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) æ ¼å¼" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "ç­‰åŒäºŽ pax" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "ç­‰åŒäºŽ --format=v7" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "ç­‰åŒäºŽ --format=posix" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "关键字[[:]=值][,关键字[[:]=值]]..." -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "控制 pax 关键字" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "TEXT" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" msgstr "创建带有å·å TEXT 的归档；在列出/解压时，使用 TEXT 作为å·å的模å¼ä¸²" -#: src/tar.c:660 +#: src/tar.c:684 msgid "Compression options:" msgstr "压缩选项:" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "使用归档åŽç¼€åæ¥å†³å®šåŽ‹ç¼©ç¨‹åº" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "ä¸ä½¿ç”¨å½’æ¡£åŽç¼€åæ¥å†³å®šåŽ‹ç¼©ç¨‹åº" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "PROG" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "通过 PROG 过滤(å¿…é¡»æ˜¯èƒ½æŽ¥å— -d 选项的程åº)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "本地文件选择:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "添加指定的 FILE 至归档(如果å字以 - 开始会很有用的)" -#: src/tar.c:687 -msgid "DIR" -msgstr "DIR" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "改å˜è‡³ç›®å½• DIR" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "从 FILE 中获å–文件åæ¥è§£åŽ‹æˆ–创建文件" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "-T 读å–以空终止的å字，-C ç¦ç”¨" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "ç¦ç”¨ä¸Šä¸€æ¬¡çš„效果 --null 选项" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" msgstr "以 -T 读å–的文件å作为引用结æŸ(默认)" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" msgstr "ä¸ä»¥ -T 读å–的文件å作为引用结æŸ" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "PATTERN" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "排除以 PATTERN 指定的文件" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "排除 FILE 中列出的模å¼ä¸²" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "é™¤æ ‡è¯†æ–‡ä»¶æœ¬èº«å¤–ï¼ŒæŽ’é™¤åŒ…å« CACHEDIR.TAG 的目录中的内容" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "æŽ’é™¤åŒ…å« CACHEDIR.TAG 的目录中所有内容" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "æŽ’é™¤åŒ…å« CACHEDIR.TAG 的目录" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "除 FILE è‡ªèº«å¤–ï¼ŒæŽ’é™¤åŒ…å« FILE 的目录中的内容" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "æŽ’é™¤åŒ…å« FILE 的目录中的所有内容" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "æŽ’é™¤åŒ…å« FILE 的目录" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "排除版本控制系统目录" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "排除备份和é”文件" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "é¿å…目录中的自动é™çº§" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "创建归档时ä¿å­˜åœ¨æœ¬åœ°æ–‡ä»¶ç³»ç»Ÿä¸­" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "目录递归(默认)" -#: src/tar.c:729 +#: src/tar.c:761 #, fuzzy msgid "don't strip leading '/'s from file names" msgstr "ä¸è¦ä»Žæ–‡ä»¶å中清除引导符‘/’" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "跟踪符å·é“¾æŽ¥ï¼›å°†å®ƒä»¬æ‰€æŒ‡å‘的文件归档并输出" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "跟踪硬链接；将它们所指å‘的文件归档并输出" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "MEMBER-NAME" -#: src/tar.c:735 +#: src/tar.c:767 #, fuzzy msgid "begin at member MEMBER-NAME when reading the archive" msgstr "从归档中的 MEMBER-NAME æˆå‘˜å¤„开始" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "åªä¿å­˜æ¯” DATE-OR-FILE 更新的文件" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "DATE" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "当åªæœ‰æ•°æ®æ”¹å˜æ—¶æ¯”较数æ®å’Œæ—¶é—´" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "CONTROL" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "在删除å‰å¤‡ä»½ï¼Œé€‰æ‹© CONTROL 版本" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "STRING" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" msgstr "" "在删除å‰å¤‡ä»½ï¼Œé™¤éžè¢«çŽ¯å¢ƒå˜é‡ SIMPLE_BACKUP_SUFFIX 覆盖，å¦åˆ™è¦†ç›–常用åŽç¼€(‘’)" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "文件åå˜æ¢:" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "解压时从文件å中清除 NUMBER 个引导部分" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "EXPRESSION" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "使用 sed 代替 EXPRESSION æ¥è¿›è¡Œæ–‡ä»¶åå˜æ¢" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "文件å匹é…选项(åŒæ—¶å½±å“排除和包括模å¼ä¸²):" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "忽略大å°å†™" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "模å¼ä¸²åŒ¹é…文件å头部" -#: src/tar.c:767 +#: src/tar.c:799 #, fuzzy msgid "patterns match after any '/' (default for exclusion)" msgstr "模å¼ä¸²åŒ¹é…任愑/’åŽå­—符(默认对 exclusion 有效)" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "匹é…大å°å†™(默认)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "使用通é…符(默认对 exclusion )" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "é€å­—匹é…字符串" -#: src/tar.c:775 +#: src/tar.c:807 #, fuzzy msgid "wildcards do not match '/'" msgstr "通é…符ä¸åŒ¹é…‘/’" -#: src/tar.c:777 +#: src/tar.c:809 #, fuzzy msgid "wildcards match '/' (default for exclusion)" msgstr "通é…符匹é…‘/’(默认对排除æ“作有效)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "æ示性输出:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "详细地列出处ç†çš„文件" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "KEYWORD" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "警告控制:" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "æ¯éš” NUMBER 个记录显示进度信æ¯(默认为 10 个)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "ACTION" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "在æ¯ä¸ªæ£€æŸ¥ç‚¹ä¸Šæ‰§è¡Œ ACTION" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "åªè¦ä¸æ˜¯æ‰€æœ‰é“¾æŽ¥éƒ½è¢«è¾“出就打å°ä¿¡æ¯" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "SIGNAL" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2124,119 +2160,119 @@ msgstr "" "å·ä¸º: SIGHUP，SIGQUIT，SIGINT，SIGUSR1 å’Œ SIGUSR2ï¼›åŒæ—¶ä¹ŸæŽ¥å—ä¸å¸¦ SIG å‰ç¼€çš„" "ä¿¡å·å称" -#: src/tar.c:802 +#: src/tar.c:834 msgid "print file modification times in UTC" msgstr "以 UTC æ ¼å¼æ‰“å°æ–‡ä»¶ä¿®æ”¹æ—¶é—´" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "按文件原本时间格å¼æ‰“å°" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "将详细输出å‘é€è‡³ FILE" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "æ¯ä¸ªä¿¡æ¯éƒ½æ˜¾ç¤ºå½’档内的å—æ•°" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "æ¯æ¬¡æ“作都è¦æ±‚确认" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "显示 tar 默认选项" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "列表或解压时，列出æ¯ä¸ªä¸åŒ¹é…查找标准的目录" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "显示å˜æ¢åŽçš„文件å或归档å" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "STYLE" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "设置å称引用风格；有效的 STYLE 值请å‚阅以下说明" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "æ¥è‡ª STRING çš„é¢å¤–的引用字符" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "ç¦ç”¨æ¥è‡ª STRING 的字符引用" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "兼容性选项:" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "创建归档时，相当于 --old-archive；展开归档时，相当于 --no-same-owner" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "其它选项:" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "ç¦ç”¨æŸäº›æ½œåœ¨çš„有å±é™©çš„选项" -#: src/tar.c:978 +#: src/tar.c:1010 #, fuzzy msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" msgstr "您ä¸èƒ½æŒ‡å®šè¶…过一个\"-Acdtrux\"或是\"--test-label\"外的选项" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "压缩选项冲çª" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "未知的信å·å称: %s" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "找ä¸åˆ°æ•°æ®æ ·æ¿æ–‡ä»¶" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "æŠŠæœªçŸ¥çš„æ—¶é—´æ ¼å¼ %2$s 替æ¢ä¸º %1$s" -#: src/tar.c:1108 +#: src/tar.c:1140 #, fuzzy, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "选项 %s: 将日期 ‘%s’ 当作 %s" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "通过 %s 过滤归档" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "--quoting-style 选项的有效å‚数为:" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2244,50 +2280,50 @@ msgstr "" "\n" "æ­¤ tar 默认为:\n" -#: src/tar.c:1295 +#: src/tar.c:1330 #, fuzzy msgid "Invalid owner or group ID" msgstr "无效的所有者" -#: src/tar.c:1339 +#: src/tar.c:1389 #, fuzzy msgid "Invalid blocking factor" msgstr "无效的å—å› å­" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "无效的ç£å¸¦é•¿åº¦" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "无效的增é‡åº¦" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "多于一个时间阈值" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 #, fuzzy msgid "Invalid sparse version value" msgstr "无效的稀ç–版本值" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "此平å°ä¸æ”¯æŒ --atime-preserve=‘system’ " -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "--checkpoint 值ä¸æ˜¯ä¸ªæ•´æ•°" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "选项中给出无效的访问模å¼" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "无效的数字" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" @@ -2295,246 +2331,240 @@ msgstr "" "--preserve 选项已ç»åºŸå¼ƒäº†ï¼Œè¯·ä½¿ç”¨ --preserve-permissions --preserve-order 代" "替" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "无效的记录大å°" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "记录大å°å¿…须是 %d çš„å€æ•°ã€‚" -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "无效的元素数" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "ä»…å…许使用一个 --to-command 选项" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "错误的压缩å‚æ•°: %s" -#: src/tar.c:2133 +#: src/tar.c:2205 #, fuzzy, c-format msgid "Unknown density: '%c'" msgstr "未知的压缩å‚æ•°: ‘%c’" -#: src/tar.c:2150 +#: src/tar.c:2222 #, fuzzy, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "本 tar ä¸æ”¯æŒé€‰é¡¹â€œ-[0-7][lmh]â€" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[FILE]..." -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 +#, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "ä¸èƒ½ä½¿ç”¨æ¨¡å¼ %s" + +#: src/tar.c:2389 #, fuzzy, c-format msgid "Old option '%c' requires an argument." msgstr "旧选项“%câ€éœ€è¦å‚数。" -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "没有一个文件列表时 --occurrence 是没有æ„义的" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "--occurrence ä¸èƒ½ç”¨äºŽè¯·æ±‚çš„æ“作模å¼ä¸­" - -#: src/tar.c:2408 +#: src/tar.c:2490 #, fuzzy msgid "Multiple archive files require '-M' option" msgstr "多个归档文件需è¦ä½¿ç”¨â€œ-Mâ€é€‰é¡¹" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "无法在使用 --newer 的时候使用 --listed-incremental" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "没有 --listed-incremental é€‰é¡¹çš„è¯ --level 选项是无æ„义的" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "%s：å·æ ‡è¿‡é•¿ (é™åˆ¶ä¸º %lu 字节)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "无法检验多å·å½’档文件" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "无法检验压缩归档文件" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "ä¸èƒ½ä½¿ç”¨æ¨¡å¼ %s" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "无法使用多å·åŽ‹ç¼©å½’档文件" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "无法è”结压缩归档文件" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option åªèƒ½ç”¨äºŽ POSIX 归档中" -#: src/tar.c:2478 +#: src/tar.c:2560 #, fuzzy msgid "--acls can be used only on POSIX archives" msgstr "--pax-option åªèƒ½ç”¨äºŽ POSIX 归档中" -#: src/tar.c:2483 +#: src/tar.c:2565 #, fuzzy msgid "--selinux can be used only on POSIX archives" msgstr "--pax-option åªèƒ½ç”¨äºŽ POSIX 归档中" -#: src/tar.c:2488 +#: src/tar.c:2570 #, fuzzy msgid "--xattrs can be used only on POSIX archives" msgstr "--pax-option åªèƒ½ç”¨äºŽ POSIX 归档中" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "ä¸èƒ½ä½¿ç”¨æ¨¡å¼ %s" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" +msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "å·é•¿åº¦ä¸å¯å°äºŽè®°å½•å¤§å°" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "--preserve-order 与 --listed-incremental ä¸åŒ¹é…" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "谨慎地拒ç»åˆ›å»ºç©ºå½’档文件" -#: src/tar.c:2565 +#: src/tar.c:2669 #, fuzzy msgid "Options '-Aru' are incompatible with '-f -'" msgstr "选项“-Aruâ€ä¸Žâ€œ-f -â€ä¸å…¼å®¹" -#: src/tar.c:2660 +#: src/tar.c:2766 #, fuzzy msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" msgstr "您必须从\"-Acdtrux\"或是\"--test-label\"选项中指定一个" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "由于å‰æ¬¡é”™è¯¯ï¼Œå°†ä»¥ä¸Šæ¬¡çš„错误状æ€é€€å‡º" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%sï¼šæ–‡ä»¶ç¼©å° %s 字节" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "关键字 %s 未知或还未实现" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" msgstr "时间标记超出å…许范围" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "ä¸èƒ½ä½¿ç”¨æ¨¡å¼ %s" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "ä¸èƒ½è¦†ç›–关键字 %s" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "错误的扩展头: 缺少 length" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "扩展头长度 %*s 超出范围" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "错误的扩展头: length åŽç¼ºå°‘空白符" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "错误的扩展头: 缺少等于符å·" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "错误的扩展头: 缺少空行" -#: src/xheader.c:740 +#: src/xheader.c:741 #, fuzzy, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "忽略未知的扩展头关键字‘%s’" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "生æˆçš„关键字/值对太长了(keyword=%s, length=%s)" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "扩展头 %s=%s 超出范围 %s..%s" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "错误的扩展头: %s=%s 无效" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "错误的扩展头: %s=%s 溢出" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "错误的扩展头: %s 无效: éžé¢„期的分隔符 %c" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "错误的扩展头: %s 无效: 奇怪的数值" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "%s: 无效的超时设置" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "%s: 未知的检查点æ“作" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "写入" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "读å–" @@ -2542,7 +2572,7 @@ msgstr "读å–" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "写入æ“作的检查点 %u" @@ -2551,7 +2581,7 @@ msgstr "写入æ“作的检查点 %u" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "读å–æ“作的检查点 %u" @@ -2802,12 +2832,19 @@ msgstr "命令终止\n" msgid "--stat requires file names" msgstr "--stat 选项需è¦æ–‡ä»¶å" -#~ msgid "Cannot get working directory" -#~ msgstr "无法获å–工作目录" - #~ msgid "sort names to extract to match archive" #~ msgstr "为解压至匹é…归档排åºå称" +#, fuzzy +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "--occurrence ä¸èƒ½ç”¨äºŽè¯·æ±‚çš„æ“作模å¼ä¸­" + +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "无法在使用 --newer 的时候使用 --listed-incremental" + +#~ msgid "--preserve-order is not compatible with --listed-incremental" +#~ msgstr "--preserve-order 与 --listed-incremental ä¸åŒ¹é…" + #~ msgid "Field too long while reading snapshot file" #~ msgstr "读å–目录文件时字段太长" @@ -2817,12 +2854,15 @@ msgstr "--stat 选项需è¦æ–‡ä»¶å" #~ msgid "Unexpected field value in snapshot file" #~ msgstr "目录文件中异常的字段值" -#~ msgid "Extended header length is out of allowed range" -#~ msgstr "扩展头长度超出所å…许的范围" +#~ msgid "Cannot get working directory" +#~ msgstr "无法获å–工作目录" #~ msgid "Invalid group" #~ msgstr "无效的组" +#~ msgid "Extended header length is out of allowed range" +#~ msgstr "扩展头长度超出所å…许的范围" + #~ msgid "%s: Directory removed before we read it" #~ msgstr "%s: 文件在读入之å‰è¢«åˆ é™¤äº†" diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo index 04cf629..ac67d92 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 3aae1eb..f0f332b 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -3,12 +3,12 @@ # This file is distributed under the same license as the tar package. # Wei-Lun Chao , 2009, 2013. # -#: src/create.c:1572 +#: src/create.c:1574 msgid "" msgstr "" "Project-Id-Version: tar 1.26\n" "Report-Msgid-Bugs-To: bug-tar@gnu.org\n" -"POT-Creation-Date: 2013-10-05 23:10+0300\n" +"POT-Creation-Date: 2014-07-27 23:35+0300\n" "PO-Revision-Date: 2013-05-31 23:39+0800\n" "Last-Translator: Wei-Lun Chao \n" "Language-Team: Chinese (traditional) \n" @@ -97,7 +97,7 @@ msgstr "給出這個使用方å¼åˆ—表" msgid "give a short usage message" msgstr "給出簡短的使用訊æ¯" -#: gnu/argp-parse.c:85 src/tar.c:512 src/tar.c:514 src/tar.c:606 +#: gnu/argp-parse.c:85 src/tar.c:529 src/tar.c:531 src/tar.c:630 #: tests/genfile.c:130 msgid "NAME" msgstr "å稱" @@ -430,7 +430,7 @@ msgstr "使用 GNU 軟體的一般說明：\n" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:58 lib/paxerror.c:71 +#: lib/paxerror.c:60 lib/paxerror.c:73 #, c-format msgid "%s: Cannot %s" msgstr "%s：無法 %s" @@ -439,54 +439,54 @@ msgstr "%s：無法 %s" #. Directly translating this to another language will not work, first because #. %s itself is not translated. #. Translate it as `%s: Function %s failed'. -#: lib/paxerror.c:84 +#: lib/paxerror.c:86 #, c-format msgid "%s: Warning: Cannot %s" msgstr "%s：警告：無法 %s" -#: lib/paxerror.c:93 +#: lib/paxerror.c:95 #, c-format msgid "%s: Cannot change mode to %s" msgstr "%s：無法變更模å¼ç‚º %s" -#: lib/paxerror.c:101 +#: lib/paxerror.c:103 #, c-format msgid "%s: Cannot change ownership to uid %lu, gid %lu" msgstr "%s：無法變更所有權為 uid %lu，gid %lu" -#: lib/paxerror.c:127 +#: lib/paxerror.c:129 #, c-format msgid "%s: Cannot hard link to %s" msgstr "%s：無法建立硬å¼é€£çµåˆ° %s" -#: lib/paxerror.c:179 lib/paxerror.c:211 +#: lib/paxerror.c:181 lib/paxerror.c:213 #, c-format msgid "%s: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Read error at byte %s, while reading %lu bytes" msgstr[0] "%sï¼šè®€å– %s ä½å…ƒçµ„æ™‚éŒ¯èª¤ï¼Œæ­£åœ¨è®€å– %lu ä½å…ƒçµ„" -#: lib/paxerror.c:192 +#: lib/paxerror.c:194 #, c-format msgid "%s: Warning: Read error at byte %s, while reading %lu byte" msgid_plural "%s: Warning: Read error at byte %s, while reading %lu bytes" msgstr[0] "%sï¼šè­¦å‘Šï¼šè®€å– %s ä½å…ƒçµ„æ™‚éŒ¯èª¤ï¼Œæ­£åœ¨è®€å– %lu ä½å…ƒçµ„" -#: lib/paxerror.c:259 +#: lib/paxerror.c:261 #, c-format msgid "%s: Cannot seek to %s" msgstr "%s：無法尋指到 %s" -#: lib/paxerror.c:275 +#: lib/paxerror.c:277 #, c-format msgid "%s: Warning: Cannot seek to %s" msgstr "%s：警告：無法尋指到 %s" -#: lib/paxerror.c:284 +#: lib/paxerror.c:286 #, c-format msgid "%s: Cannot create symlink to %s" msgstr "%s：無法建立符號連çµåˆ° %s" -#: lib/paxerror.c:349 +#: lib/paxerror.c:351 #, c-format msgid "%s: Wrote only %lu of %lu byte" msgid_plural "%s: Wrote only %lu of %lu bytes" @@ -584,8 +584,8 @@ msgstr "未é æœŸçš„引數" msgid "Manipulate a tape drive, accepting commands from a remote process" msgstr "æ“控ç£å¸¶æ©Ÿï¼Œå¾žé ç«¯è¡Œç¨‹æŽ¥å—命令" -#: rmt/rmt.c:696 src/tar.c:440 src/tar.c:444 src/tar.c:604 src/tar.c:619 -#: src/tar.c:750 src/tar.c:788 tests/genfile.c:166 +#: rmt/rmt.c:696 src/tar.c:454 src/tar.c:458 src/tar.c:628 src/tar.c:643 +#: src/tar.c:782 src/tar.c:820 tests/genfile.c:166 msgid "NUMBER" msgstr "數目" @@ -593,10 +593,10 @@ msgstr "數目" msgid "set debug level" msgstr "設定除錯等級" -#: rmt/rmt.c:698 src/tar.c:438 src/tar.c:609 src/tar.c:685 src/tar.c:689 -#: src/tar.c:701 src/tar.c:711 src/tar.c:714 src/tar.c:716 src/tar.c:805 -#: tests/genfile.c:132 tests/genfile.c:180 tests/genfile.c:184 -#: tests/genfile.c:187 tests/genfile.c:193 +#: rmt/rmt.c:698 src/tar.c:452 src/tar.c:633 src/tar.c:709 src/tar.c:713 +#: src/tar.c:725 src/tar.c:735 src/tar.c:738 src/tar.c:741 src/tar.c:744 +#: src/tar.c:746 src/tar.c:837 tests/genfile.c:132 tests/genfile.c:180 +#: tests/genfile.c:184 tests/genfile.c:187 tests/genfile.c:193 msgid "FILE" msgstr "檔案" @@ -618,101 +618,109 @@ msgstr "太多引數" msgid "Garbage command" msgstr "無用的命令" -#: src/buffer.c:457 src/buffer.c:462 src/buffer.c:706 src/buffer.c:1322 -#: src/buffer.c:1368 src/buffer.c:1397 src/delete.c:212 src/list.c:244 +#: src/buffer.c:458 src/buffer.c:463 src/buffer.c:757 src/buffer.c:1373 +#: src/buffer.c:1419 src/buffer.c:1448 src/delete.c:212 src/list.c:273 #: src/update.c:188 msgid "This does not look like a tar archive" msgstr "這個看起來ä¸åƒ tar å°å­˜" -#: src/buffer.c:521 src/buffer.c:530 -msgid "Total bytes written" -msgstr "已寫入ä½å…ƒçµ„總數" - -#: src/buffer.c:528 src/buffer.c:542 +#: src/buffer.c:574 msgid "Total bytes read" msgstr "已讀å–ä½å…ƒçµ„總數" -#: src/buffer.c:532 -#, c-format -msgid "Total bytes deleted: %s\n" +#: src/buffer.c:576 +msgid "Total bytes written" +msgstr "已寫入ä½å…ƒçµ„總數" + +#: src/buffer.c:577 +#, fuzzy +msgid "Total bytes deleted" msgstr "已刪除ä½å…ƒçµ„總數：%s\n" -#: src/buffer.c:621 +#: src/buffer.c:656 msgid "(pipe)" msgstr "(管線)" -#: src/buffer.c:644 +#: src/buffer.c:680 +msgid "Refusing to read archive contents from terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:682 +msgid "Refusing to write archive contents to terminal (missing -f option?)" +msgstr "" + +#: src/buffer.c:695 msgid "Invalid value for record_size" msgstr "無效的記錄大å°" -#: src/buffer.c:647 +#: src/buffer.c:698 msgid "No archive name given" msgstr "沒有指定å°å­˜å稱" -#: src/buffer.c:689 +#: src/buffer.c:741 msgid "Cannot verify stdin/stdout archive" msgstr "無法檢驗標準輸出入å°å­˜" -#: src/buffer.c:703 +#: src/buffer.c:754 #, c-format msgid "Archive is compressed. Use %s option" msgstr "å°å­˜è¢«å£“縮éŽã€‚使用 %s é¸é …" -#: src/buffer.c:761 src/tar.c:2459 +#: src/buffer.c:812 src/tar.c:2541 msgid "Cannot update compressed archives" msgstr "無法更新壓縮的å°å­˜" -#: src/buffer.c:854 +#: src/buffer.c:905 msgid "At beginning of tape, quitting now" msgstr "ä½æ–¼ç£å¸¶èµ·å§‹éƒ¨åˆ†ï¼Œç«‹åˆ»é€€å‡º" -#: src/buffer.c:860 +#: src/buffer.c:911 msgid "Too many errors, quitting" msgstr "太多錯誤，離開中" -#: src/buffer.c:893 +#: src/buffer.c:944 #, c-format msgid "Record size = %lu block" msgid_plural "Record size = %lu blocks" msgstr[0] "è¨˜éŒ„å¤§å° = %lu å€å¡Š" -#: src/buffer.c:914 +#: src/buffer.c:965 #, c-format msgid "Unaligned block (%lu byte) in archive" msgid_plural "Unaligned block (%lu bytes) in archive" msgstr[0] "å°å­˜ä¸­æœªæŽ’列的å€å¡Š (%lu ä½å…ƒçµ„)" -#: src/buffer.c:991 +#: src/buffer.c:1042 msgid "Cannot backspace archive file; it may be unreadable without -i" msgstr "無法倒退å°å­˜æª”案；沒有 -i 也許會無法讀å–" -#: src/buffer.c:1023 +#: src/buffer.c:1074 msgid "rmtlseek not stopped at a record boundary" msgstr "rmtlseek 無法在記錄分界處åœæ­¢" -#: src/buffer.c:1074 +#: src/buffer.c:1125 #, c-format msgid "%s: contains invalid volume number" msgstr "%s：包å«ç„¡æ•ˆçš„å·å†Šè™Ÿç¢¼" -#: src/buffer.c:1109 +#: src/buffer.c:1160 msgid "Volume number overflow" msgstr "å·å†Šè™Ÿç¢¼å·²æ»¿" -#: src/buffer.c:1124 +#: src/buffer.c:1175 #, c-format msgid "Prepare volume #%d for %s and hit return: " msgstr "準備好å·å†Š #%d ä»¥å®Œæˆ %s 並按下 return: " -#: src/buffer.c:1130 +#: src/buffer.c:1181 msgid "EOF where user reply was expected" msgstr "到é”期待使用者回答的檔案末端" -#: src/buffer.c:1135 src/buffer.c:1167 +#: src/buffer.c:1186 src/buffer.c:1218 msgid "WARNING: Archive is incomplete" msgstr "警告：å°å­˜ä¸å®Œæ•´" -#: src/buffer.c:1149 +#: src/buffer.c:1200 #, c-format msgid "" " n name Give a new file name for the next (and subsequent) volume(s)\n" @@ -723,71 +731,71 @@ msgstr "" " q 放棄打包\n" " y 或 newline 繼續作業\n" -#: src/buffer.c:1154 +#: src/buffer.c:1205 #, c-format msgid " ! Spawn a subshell\n" msgstr " ! è¡ç”Ÿä¸€å€‹å­å‘½ä»¤æ®¼\n" -#: src/buffer.c:1155 +#: src/buffer.c:1206 #, c-format msgid " ? Print this list\n" msgstr " ? 列å°é€™å€‹æ¸…å–®\n" -#: src/buffer.c:1162 +#: src/buffer.c:1213 msgid "No new volume; exiting.\n" msgstr "沒有新å·å†Šï¼›é›¢é–‹ã€‚\n" -#: src/buffer.c:1195 +#: src/buffer.c:1246 msgid "File name not specified. Try again.\n" msgstr "檔案å稱尚未指定。å†æ¬¡å˜—試。\n" -#: src/buffer.c:1208 +#: src/buffer.c:1259 #, c-format msgid "Invalid input. Type ? for help.\n" msgstr "無效的輸入。按下 ? 以ç²å¾—說明。\n" -#: src/buffer.c:1259 +#: src/buffer.c:1310 #, c-format msgid "%s command failed" msgstr "%s 命令失敗" -#: src/buffer.c:1440 +#: src/buffer.c:1491 #, c-format msgid "%s is possibly continued on this volume: header contains truncated name" msgstr "%s 在本å·å†Šä¸­å¯èƒ½é€£çºŒï¼šæ¨™é ­å«æœ‰æˆªæ–·çš„å稱" -#: src/buffer.c:1444 +#: src/buffer.c:1495 #, c-format msgid "%s is not continued on this volume" msgstr "%s 在本å·å†Šä¸­ä¸¦ä¸é€£çºŒ" -#: src/buffer.c:1458 +#: src/buffer.c:1509 #, c-format msgid "%s is the wrong size (%s != %s + %s)" msgstr "%s 的大å°æœ‰éŒ¯ (%s != %s + %s)" -#: src/buffer.c:1473 +#: src/buffer.c:1524 #, c-format msgid "This volume is out of sequence (%s - %s != %s)" msgstr "本å·å†Šå·²è¶…出åºåˆ— (%s - %s !=%s)" -#: src/buffer.c:1551 src/buffer.c:1577 +#: src/buffer.c:1602 src/buffer.c:1628 #, c-format msgid "Archive not labeled to match %s" msgstr "å°å­˜æœªæ¨™èªŒç‚ºç¬¦åˆ %s" -#: src/buffer.c:1581 +#: src/buffer.c:1632 #, c-format msgid "Volume %s does not match %s" msgstr "å·å†Š %s ä¸ç¬¦åˆ %s" -#: src/buffer.c:1675 +#: src/buffer.c:1726 #, c-format msgid "" "%s: file name too long to be stored in a GNU multivolume header, truncated" msgstr "%s：檔å太長，無法儲存於 GNU 多é‡å·å†Šæ¨™é ­ä¹‹ä¸­ï¼Œå·²æˆªæ–·" -#: src/buffer.c:1866 +#: src/buffer.c:1917 msgid "write did not end on a block boundary" msgstr "並未於å€æ®µç•Œé™çµæŸå¯«å…¥" @@ -797,16 +805,16 @@ msgid "Could only read %lu of %lu byte" msgid_plural "Could only read %lu of %lu bytes" msgstr[0] "åªèƒ½è®€å– %2$lu ä½å…ƒçµ„中的 %1$lu 個" -#: src/compare.c:106 src/compare.c:388 +#: src/compare.c:106 src/compare.c:391 msgid "Contents differ" msgstr "內容ä¸åŒ" -#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1503 src/list.c:458 -#: src/list.c:1394 src/xheader.c:836 +#: src/compare.c:132 src/extract.c:1132 src/incremen.c:1505 src/list.c:487 +#: src/list.c:1426 src/xheader.c:837 msgid "Unexpected EOF in archive" msgstr "未é æœŸçš„å°å­˜çµå°¾" -#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:412 +#: src/compare.c:180 src/compare.c:196 src/compare.c:310 src/compare.c:415 msgid "File type differs" msgstr "檔案類型ä¸åŒ" @@ -826,7 +834,7 @@ msgstr "Gid 號碼ä¸åŒ" msgid "Mod time differs" msgstr "修改時間ä¸åŒ" -#: src/compare.c:216 src/compare.c:422 +#: src/compare.c:216 src/compare.c:425 msgid "Size differs" msgstr "大å°ä¸åŒ" @@ -843,35 +851,35 @@ msgstr "符號連çµä¸åŒ" msgid "Device number differs" msgstr "è£ç½®ç·¨è™Ÿä¸åŒ" -#: src/compare.c:464 +#: src/compare.c:466 #, c-format msgid "Verify " msgstr "é©—è­‰ " -#: src/compare.c:471 +#: src/compare.c:473 #, fuzzy, c-format msgid "%s: Unknown file type '%c', diffed as normal file" msgstr "%s：ä¸æ˜Žæª”案類型 %c，會以普通檔案的方å¼ä½œæ¯”較" -#: src/compare.c:527 +#: src/compare.c:529 msgid "Archive contains file names with leading prefixes removed." msgstr "å°å­˜åŒ…å«å‰ç½®æ–‡å­—被移除的檔案å稱。" -#: src/compare.c:533 +#: src/compare.c:535 msgid "Archive contains transformed file names." msgstr "å°å­˜å«æœ‰è®Šæ›éŽçš„檔案å稱。" -#: src/compare.c:538 +#: src/compare.c:540 msgid "Verification may fail to locate original files." msgstr "查核動作å¯èƒ½ç„¡æ³•æ‰¾åˆ°åŽŸå§‹æª”案" -#: src/compare.c:612 +#: src/compare.c:614 #, c-format msgid "VERIFY FAILURE: %d invalid header detected" msgid_plural "VERIFY FAILURE: %d invalid headers detected" msgstr[0] "驗證失敗：%d åµæ¸¬åˆ°ç„¡æ•ˆçš„標頭" -#: src/compare.c:630 src/list.c:221 +#: src/compare.c:632 src/list.c:250 #, c-format msgid "A lone zero block at %s" msgstr "ä½æ–¼ %s 的孤立零值å€å¡Š" @@ -916,55 +924,55 @@ msgid "%s: File shrank by %s byte; padding with zeros" msgid_plural "%s: File shrank by %s bytes; padding with zeros" msgstr[0] "%s：檔案縮å°äº† %s ä½å…ƒçµ„；以零值填補" -#: src/create.c:1180 +#: src/create.c:1182 #, c-format msgid "%s: file is on a different filesystem; not dumped" msgstr "%s：檔案ä½æ–¼ä¸åŒçš„檔案系統；未傾å°" -#: src/create.c:1223 src/create.c:1234 src/incremen.c:610 src/incremen.c:617 +#: src/create.c:1225 src/create.c:1236 src/incremen.c:610 src/incremen.c:617 msgid "contents not dumped" msgstr "內容無法傾å°" -#: src/create.c:1438 +#: src/create.c:1440 #, c-format msgid "%s: Unknown file type; file ignored" msgstr "%s：ä¸æ˜Žæª”案類型；忽略該檔案" -#: src/create.c:1549 +#: src/create.c:1551 #, c-format msgid "Missing links to %s." msgstr "缺少連çµåˆ° %s。" -#: src/create.c:1710 +#: src/create.c:1712 #, c-format msgid "%s: file is unchanged; not dumped" msgstr "%s：檔案沒有變更；未傾å°" -#: src/create.c:1719 +#: src/create.c:1721 #, c-format msgid "%s: file is the archive; not dumped" msgstr "%s：檔案是å°å­˜ï¼›æœªå‚¾å°" -#: src/create.c:1747 src/incremen.c:603 +#: src/create.c:1749 src/incremen.c:603 msgid "directory not dumped" msgstr "目錄未傾å°" -#: src/create.c:1819 +#: src/create.c:1821 #, c-format msgid "%s: file changed as we read it" msgstr "%s：檔案在讀å–時已變更" -#: src/create.c:1900 +#: src/create.c:1902 #, c-format msgid "%s: socket ignored" msgstr "%s：忽略通訊端" -#: src/create.c:1906 +#: src/create.c:1908 #, c-format msgid "%s: door ignored" msgstr "%s：忽略匣門" -#: src/delete.c:218 src/list.c:258 src/update.c:193 +#: src/delete.c:218 src/list.c:287 src/update.c:193 msgid "Skipping to next header" msgstr "跳至下一個標頭" @@ -1010,7 +1018,7 @@ msgstr "嘗試解開符號連çµç‚ºç¡¬å¼é€£çµ" msgid "%s: Cannot extract -- file is continued from another volume" msgstr "%s：無法解開 -- 檔案延續自其他å·å†Š" -#: src/extract.c:1535 src/list.c:1135 +#: src/extract.c:1535 src/list.c:1167 msgid "Unexpected long name header" msgstr "未é æœŸçš„é•·å稱標頭" @@ -1054,250 +1062,250 @@ msgstr "%s：檔案ä½æ–¼ä¸åŒçš„檔案系統；未傾å°" msgid "%s: Directory has been renamed" msgstr "%s：目錄已被é‡æ–°å‘½å" -#: src/incremen.c:1001 src/incremen.c:1016 +#: src/incremen.c:1003 src/incremen.c:1018 msgid "Invalid time stamp" msgstr "無效的時間戳記" -#: src/incremen.c:1045 +#: src/incremen.c:1047 #, fuzzy msgid "Invalid modification time" msgstr "無效的修改時間 (秒)" -#: src/incremen.c:1055 +#: src/incremen.c:1057 msgid "Invalid modification time (nanoseconds)" msgstr "無效的修改時間 (奈秒)" -#: src/incremen.c:1071 +#: src/incremen.c:1073 msgid "Invalid device number" msgstr "無效的è£ç½®è™Ÿç¢¼" -#: src/incremen.c:1079 +#: src/incremen.c:1081 msgid "Invalid inode number" msgstr "無效的 inode 號碼" -#: src/incremen.c:1135 +#: src/incremen.c:1137 #, c-format msgid "%s: byte %s: %s %.*s... too long" msgstr "" -#: src/incremen.c:1151 src/incremen.c:1206 src/incremen.c:1268 +#: src/incremen.c:1153 src/incremen.c:1208 src/incremen.c:1270 msgid "Unexpected EOF in snapshot file" msgstr "未é æœŸçš„快照檔çµå°¾" -#: src/incremen.c:1157 +#: src/incremen.c:1159 #, c-format msgid "%s: byte %s: %s %s followed by invalid byte 0x%02x" msgstr "" -#: src/incremen.c:1169 +#: src/incremen.c:1171 #, c-format msgid "" "%s: byte %s: (valid range %s..%s)\n" "\t%s %s" msgstr "" -#: src/incremen.c:1176 +#: src/incremen.c:1178 #, c-format msgid "%s: byte %s: %s %s" msgstr "" -#: src/incremen.c:1257 +#: src/incremen.c:1259 #, c-format msgid "%s: byte %s: %s" msgstr "" -#: src/incremen.c:1260 +#: src/incremen.c:1262 msgid "Missing record terminator" msgstr "缺少記錄終止符號" -#: src/incremen.c:1366 src/incremen.c:1369 +#: src/incremen.c:1368 src/incremen.c:1371 msgid "Bad incremental file format" msgstr "ä¸ç•¶çš„éžå¢žæª”案格å¼" -#: src/incremen.c:1388 +#: src/incremen.c:1390 #, c-format msgid "Unsupported incremental format version: %" msgstr "ä¸å—支æ´çš„éžå¢žæ ¼å¼ç‰ˆæœ¬ï¼š%" -#: src/incremen.c:1543 +#: src/incremen.c:1545 #, c-format msgid "Malformed dumpdir: expected '%c' but found %#3o" msgstr "異常的傾å°ç›®éŒ„：é æœŸ %c 但是找到 %#3o" -#: src/incremen.c:1553 +#: src/incremen.c:1555 msgid "Malformed dumpdir: 'X' duplicated" msgstr "異常的傾å°ç›®éŒ„：X é‡è£½" -#: src/incremen.c:1566 +#: src/incremen.c:1568 msgid "Malformed dumpdir: empty name in 'R'" msgstr "異常的傾å°ç›®éŒ„：在 R 中有空的å稱" -#: src/incremen.c:1579 +#: src/incremen.c:1581 msgid "Malformed dumpdir: 'T' not preceeded by 'R'" msgstr "異常的傾å°ç›®éŒ„：R 未在 T 之å‰" -#: src/incremen.c:1585 +#: src/incremen.c:1587 msgid "Malformed dumpdir: empty name in 'T'" msgstr "異常的傾å°ç›®éŒ„：在 T 中有空的å稱" -#: src/incremen.c:1605 +#: src/incremen.c:1607 #, c-format msgid "Malformed dumpdir: expected '%c' but found end of data" msgstr "異常的傾å°ç›®éŒ„：é æœŸ %c 但是發ç¾è³‡æ–™çš„çµæŸ" -#: src/incremen.c:1612 +#: src/incremen.c:1614 msgid "Malformed dumpdir: 'X' never used" msgstr "異常的傾å°ç›®éŒ„：X æ°¸ä¸ä½¿ç”¨" -#: src/incremen.c:1656 +#: src/incremen.c:1658 #, c-format msgid "Cannot create temporary directory using template %s" msgstr "ç„¡æ³•ä½¿ç”¨æ¨¡æ¿ %s 建立暫存目錄" -#: src/incremen.c:1717 +#: src/incremen.c:1719 #, c-format msgid "%s: Not purging directory: unable to stat" msgstr "%s：未能清空目錄；無法顯示狀態" -#: src/incremen.c:1730 +#: src/incremen.c:1732 #, c-format msgid "%s: directory is on a different device: not purging" msgstr "%s：目錄ä½æ–¼ä¸åŒçš„è£ç½®ï¼›ç„¡æ³•æ¸…空" -#: src/incremen.c:1738 +#: src/incremen.c:1740 #, c-format msgid "%s: Deleting %s\n" msgstr "%s：正在刪除 %s\n" -#: src/incremen.c:1743 +#: src/incremen.c:1745 #, c-format msgid "%s: Cannot remove" msgstr "%s：無法移除" -#: src/list.c:189 +#: src/list.c:217 #, c-format msgid "%s: Omitting" msgstr "%s：çœç•¥ä¸­" -#: src/list.c:206 +#: src/list.c:235 #, c-format msgid "block %s: ** Block of NULs **\n" msgstr "å€å¡Š %s：** 空值å€å¡Š **\n" -#: src/list.c:232 +#: src/list.c:261 #, c-format msgid "block %s: ** End of File **\n" msgstr "å€å¡Š %s：** 檔案çµå°¾ **\n" -#: src/list.c:255 src/list.c:1107 src/list.c:1362 +#: src/list.c:284 src/list.c:1136 src/list.c:1394 #, c-format msgid "block %s: " msgstr "å€å¡Š %s：" #. TRANSLATORS: %s is type of the value (gid_t, uid_t, #. etc.) -#: src/list.c:722 +#: src/list.c:751 #, c-format msgid "Blanks in header where numeric %s value expected" msgstr "空白出ç¾åœ¨æ¨™é ­ä¸­é æœŸç‚ºæ•¸å€¼ %s 的地方" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:777 +#: src/list.c:806 #, c-format msgid "Archive octal value %.*s is out of %s range; assuming two's complement" msgstr "å°å­˜å…«é€²ä½æ•¸å€¼ %.*s 超出 %s 範åœï¼›å‡å®šç‚ºäºŒçš„補數" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:788 +#: src/list.c:817 #, c-format msgid "Archive octal value %.*s is out of %s range" msgstr "å°å­˜å…«é€²ä½æ•¸å€¼ %.*s 超出 %s 範åœ" -#: src/list.c:809 +#: src/list.c:838 msgid "Archive contains obsolescent base-64 headers" msgstr "å°å­˜å«æœ‰éŽæ™‚çš„ base-64 標頭" -#: src/list.c:823 +#: src/list.c:852 #, c-format msgid "Archive signed base-64 string %s is out of %s range" msgstr "å°å­˜æœ‰è™Ÿ base-64 字串 %s 超出 %s 範åœ" -#: src/list.c:854 +#: src/list.c:883 #, c-format msgid "Archive base-256 value is out of %s range" msgstr "å°å­˜ base-256 值超出 %s 範åœ" #. TRANSLATORS: Second %s is a type name (gid_t,uid_t,etc.) -#: src/list.c:883 +#: src/list.c:912 #, c-format msgid "Archive contains %.*s where numeric %s value expected" msgstr "å°å­˜åŒ…å« %.*s æ–¼é æœŸç‚ºæ•¸å€¼ %s 的地方" #. TRANSLATORS: Second %s is type name (gid_t,uid_t,etc.) -#: src/list.c:905 +#: src/list.c:934 #, c-format msgid "Archive value %s is out of %s range %s..%s" msgstr "å°å­˜å€¼ %s 已超出 %s çš„ç¯„åœ %s..%s" -#: src/list.c:1262 +#: src/list.c:1294 #, c-format msgid " link to %s\n" msgstr " 連çµåˆ° %s\n" -#: src/list.c:1270 +#: src/list.c:1302 #, c-format msgid " unknown file type %s\n" msgstr " ä¸æ˜Žæª”案類型 %s\n" -#: src/list.c:1288 +#: src/list.c:1320 #, c-format msgid "--Long Link--\n" msgstr "--é•· 連 çµ--\n" -#: src/list.c:1292 +#: src/list.c:1324 #, c-format msgid "--Long Name--\n" msgstr "--é•· å 稱--\n" -#: src/list.c:1296 +#: src/list.c:1328 #, c-format msgid "--Volume Header--\n" msgstr "--å· å†Š 標 é ­--\n" -#: src/list.c:1304 +#: src/list.c:1336 #, c-format msgid "--Continued at byte %s--\n" msgstr "--於第 %s ä½å…ƒçµ„繼續--\n" -#: src/list.c:1367 +#: src/list.c:1399 msgid "Creating directory:" msgstr "正在建立目錄：" -#: src/misc.c:721 +#: src/misc.c:726 #, c-format msgid "Renaming %s to %s\n" msgstr "正在將 %s é‡æ–°å‘½å為 %s\n" -#: src/misc.c:730 src/misc.c:749 +#: src/misc.c:735 src/misc.c:754 #, c-format msgid "%s: Cannot rename to %s" msgstr "%s：無法é‡æ–°å‘½å為 %s" -#: src/misc.c:754 +#: src/misc.c:759 #, c-format msgid "Renaming %s back to %s\n" msgstr "å°‡ %s çš„å稱還原為 %s\n" -#: src/misc.c:1093 +#: src/misc.c:1101 #, c-format msgid "%s: File removed before we read it" msgstr "%s：讀å–檔案之å‰å·²è¢«ç§»é™¤" -#: src/misc.c:1114 +#: src/misc.c:1122 msgid "child process" msgstr "å­è¡Œç¨‹" -#: src/misc.c:1123 +#: src/misc.c:1131 msgid "interprocess channel" msgstr "行程間通é“" @@ -1311,7 +1319,7 @@ msgstr "%s 命令失敗" msgid "%s: file list requested from %s already read from %s" msgstr "%s：已經讀å–檔案清單" -#: src/names.c:448 +#: src/names.c:448 src/checkpoint.c:274 #, fuzzy, c-format msgid "cannot split string '%s': %s" msgstr "無法設定時間為 %s" @@ -1321,61 +1329,61 @@ msgstr "無法設定時間為 %s" msgid "%s: file name read contains nul character" msgstr "%s：所讀檔案å稱å«æœ‰ç©ºå€¼å­—å…ƒ" -#: src/names.c:821 +#: src/names.c:824 msgid "Pattern matching characters used in file names" msgstr "用於檔案å稱的胚騰匹é…å­—å…ƒ" -#: src/names.c:823 +#: src/names.c:826 msgid "" "Use --wildcards to enable pattern matching, or --no-wildcards to suppress " "this warning" msgstr "使用 --wildcards 以啟用胚騰匹é…，或 --no-wildcards 以抑制這個警告" -#: src/names.c:841 src/names.c:857 +#: src/names.c:844 src/names.c:860 #, c-format msgid "%s: Not found in archive" msgstr "%s：在å°å­˜ä¸­æ‰¾ä¸åˆ°" -#: src/names.c:842 +#: src/names.c:845 #, c-format msgid "%s: Required occurrence not found in archive" msgstr "%s：è¦æ±‚項目在å°å­˜ä¸­æ‰¾ä¸åˆ°" -#: src/names.c:876 +#: src/names.c:879 #, c-format msgid "Archive label mismatch" msgstr "å°å­˜æ¨™è²¼ä¸åŒ¹é…" -#: src/names.c:1180 +#: src/names.c:1183 msgid "" "Using -C option inside file list is not allowed with --listed-incremental" msgstr "於檔案清單內部使用 -C é¸é …是ä¸å…許與 --listed-incremental 共用" -#: src/names.c:1186 +#: src/names.c:1189 msgid "Only one -C option is allowed with --listed-incremental" msgstr "åªæœ‰ä¸€å€‹ -C é¸é …是å…許與 --listed-incremental 共用" -#: src/tar.c:86 +#: src/tar.c:87 #, fuzzy, c-format -msgid "Options '-%s' and '-%s' both want standard input" +msgid "Options '%s' and '%s' both want standard input" msgstr "é¸é … -%s å’Œ -%s 兩者都需è¦æ¨™æº–輸入" -#: src/tar.c:163 +#: src/tar.c:164 #, c-format msgid "%s: Invalid archive format" msgstr "%s：無效的å°å­˜æ ¼å¼" -#: src/tar.c:187 +#: src/tar.c:196 msgid "GNU features wanted on incompatible archive format" msgstr "ä¸èƒ½åœ¨ä¸å…¼å®¹çš„å°å­˜æ ¼å¼ä¸­ä½¿ç”¨ GNU 功能" -#: src/tar.c:255 +#: src/tar.c:264 #, fuzzy, c-format msgid "" "Unknown quoting style '%s'. Try '%s --quoting-style=help' to get a list." msgstr "ä¸æ˜Žå¼•è™Ÿæ¨£å¼ %s 。嘗試 %s --quoting-style=help 以å–得清單。" -#: src/tar.c:364 +#: src/tar.c:378 #, fuzzy msgid "" "GNU 'tar' saves many files together into a single tape or disk archive, and " @@ -1394,7 +1402,7 @@ msgstr "" " tar -tvf archive.tar # 詳細列出 archive.tar 中的所有檔案。\n" " tar -xf archive.tar # 解開 archive.tar 中的所有檔案。\n" -#: src/tar.c:373 +#: src/tar.c:387 #, fuzzy msgid "" "The backup suffix is '~', unless set with --suffix or SIMPLE_BACKUP_SUFFIX.\n" @@ -1414,79 +1422,79 @@ msgstr "" " nil, existing 若有數字的備份檔已經存在則使用數字，å¦å‰‡ä½¿ç”¨æ™®é€šæ–¹å¼å‚™ä»½\n" " never, simple æ°¸é ä½¿ç”¨æ™®é€šæ–¹å¼å‚™ä»½\n" -#: src/tar.c:403 +#: src/tar.c:417 msgid "Main operation mode:" msgstr "主è¦æ“作模å¼:" -#: src/tar.c:406 +#: src/tar.c:420 msgid "list the contents of an archive" msgstr "列出å°å­˜çš„內容" -#: src/tar.c:408 +#: src/tar.c:422 msgid "extract files from an archive" msgstr "從å°å­˜ä¸­è§£é–‹æª”案" -#: src/tar.c:411 +#: src/tar.c:425 msgid "create a new archive" msgstr "建立新的å°å­˜" -#: src/tar.c:413 +#: src/tar.c:427 msgid "find differences between archive and file system" msgstr "在å°å­˜èˆ‡æª”案系統之間找出差異" -#: src/tar.c:416 +#: src/tar.c:430 msgid "append files to the end of an archive" msgstr "加入檔案到å°å­˜æœ«ç«¯" -#: src/tar.c:418 +#: src/tar.c:432 msgid "only append files newer than copy in archive" msgstr "åªåŠ å…¥æ¯”å°å­˜ä¸­è¤‡æœ¬é‚„新的檔案" -#: src/tar.c:420 +#: src/tar.c:434 msgid "append tar files to an archive" msgstr "加入 tar 檔案到å°å­˜ä¸­" -#: src/tar.c:423 +#: src/tar.c:437 msgid "delete from the archive (not on mag tapes!)" msgstr "從å°å­˜ä¸­åˆªé™¤ (並éžåœ¨ç£å¸¶ä¸Šï¼)" -#: src/tar.c:425 +#: src/tar.c:439 msgid "test the archive volume label and exit" msgstr "測試å°å­˜å·å†Šæ¨™ç±¤ç„¶å¾Œé›¢é–‹" -#: src/tar.c:430 +#: src/tar.c:444 msgid "Operation modifiers:" msgstr "é‹ç®—變更項:" -#: src/tar.c:433 +#: src/tar.c:447 msgid "handle sparse files efficiently" msgstr "有效率地處ç†ç¨€ç–檔案" -#: src/tar.c:434 +#: src/tar.c:448 msgid "MAJOR[.MINOR]" msgstr "MAJOR[.MINOR]" -#: src/tar.c:435 +#: src/tar.c:449 msgid "set version of the sparse format to use (implies --sparse)" msgstr "設定稀ç–æ ¼å¼ç‰ˆæœ¬ä»¥ä½¿ç”¨ (æ„味著 --sparse)" -#: src/tar.c:437 +#: src/tar.c:451 msgid "handle old GNU-format incremental backup" msgstr "處ç†èˆŠåž‹ GNU-æ ¼å¼ä¹‹éžå¢žå‚™ä»½" -#: src/tar.c:439 +#: src/tar.c:453 msgid "handle new GNU-format incremental backup" msgstr "處ç†æ–°åž‹ GNU-æ ¼å¼ä¹‹éžå¢žå‚™ä»½" -#: src/tar.c:441 +#: src/tar.c:455 msgid "dump level for created listed-incremental archive" msgstr "用於建立 listed-incremental å°å­˜çš„傾å°ç­‰ç´š" -#: src/tar.c:443 +#: src/tar.c:457 msgid "do not exit with nonzero on unreadable files" msgstr "離開無法讀å–的檔案時ä¸è¦å›žå‚³éžé›¶çš„值" -#: src/tar.c:445 +#: src/tar.c:459 msgid "" "process only the NUMBERth occurrence of each file in the archive; this " "option is valid only in conjunction with one of the subcommands --delete, --" @@ -1497,130 +1505,138 @@ msgstr "" "diffã€--extract 或 --list 等次命令之一åˆä½µä½¿ç”¨æ™‚æ‰æœ‰æ•ˆï¼Œè€Œä¸”è¦ç¶“由命令列或是 " "-T é¸é …來æ供一個檔案åºåˆ—。é è¨­çš„數目是 1。" -#: src/tar.c:451 +#: src/tar.c:465 msgid "archive is seekable" msgstr "å°å­˜æ˜¯å¯å°‹æŒ‡çš„" -#: src/tar.c:453 +#: src/tar.c:467 msgid "archive is not seekable" msgstr "å°å­˜ä¸æ˜¯å¯å°‹æŒ‡çš„" -#: src/tar.c:455 +#: src/tar.c:469 msgid "do not check device numbers when creating incremental archives" msgstr "ä¸æª¢æŸ¥è£ç½®æ•¸é‡æ™‚建立éžå¢žæª”案" -#: src/tar.c:458 +#: src/tar.c:472 msgid "check device numbers when creating incremental archives (default)" msgstr "檢查è£ç½®æ•¸é‡æ™‚建立éžå¢žæª”案 (é è¨­)" -#: src/tar.c:464 +#: src/tar.c:478 msgid "Overwrite control:" msgstr "覆寫控制：" -#: src/tar.c:467 +#: src/tar.c:481 msgid "attempt to verify the archive after writing it" msgstr "嘗試在寫入之後驗證å°å­˜" -#: src/tar.c:469 +#: src/tar.c:483 msgid "remove files after adding them to the archive" msgstr "在加入檔案至å°å­˜ä¹‹å¾Œç§»é™¤å®ƒå€‘" -#: src/tar.c:471 +#: src/tar.c:485 #, fuzzy msgid "don't replace existing files when extracting, treat them as errors" msgstr "解開時ä¸è¦æ›¿æ›æ—¢æœ‰çš„檔案" -#: src/tar.c:474 +#: src/tar.c:488 #, fuzzy msgid "don't replace existing files when extracting, silently skip over them" msgstr "解開時ä¸è¦æ›¿æ›æ—¢æœ‰çš„檔案" -#: src/tar.c:477 +#: src/tar.c:491 msgid "don't replace existing files that are newer than their archive copies" msgstr "ä¸è¦æ›¿æ›æ—¢æœ‰ä¸”比它們在å°å­˜ä¸­è¤‡æœ¬é‚„新的檔案" -#: src/tar.c:479 +#: src/tar.c:493 msgid "overwrite existing files when extracting" msgstr "解開時覆寫既有檔案" -#: src/tar.c:481 +#: src/tar.c:495 msgid "remove each file prior to extracting over it" msgstr "在解開並覆寫檔案之å‰å…ˆç§»é™¤å®ƒ" -#: src/tar.c:483 +#: src/tar.c:497 msgid "empty hierarchies prior to extracting directory" msgstr "在解開目錄之å‰å…ˆæ¸…空階層çµæ§‹" -#: src/tar.c:485 +#: src/tar.c:499 msgid "preserve metadata of existing directories" msgstr "ä¿ç•™æ—¢æœ‰ç›®éŒ„的後設資料" -#: src/tar.c:487 +#: src/tar.c:501 msgid "overwrite metadata of existing directories when extracting (default)" msgstr "解開時覆寫既有目錄的後設資料 (é è¨­)" -#: src/tar.c:490 +#: src/tar.c:504 #, fuzzy msgid "preserve existing symlinks to directories when extracting" msgstr "解開時覆寫既有檔案" -#: src/tar.c:496 +#: src/tar.c:506 src/tar.c:711 +msgid "DIR" +msgstr "目錄" + +#: src/tar.c:507 +msgid "create a subdirectory to avoid having loose files extracted" +msgstr "" + +#: src/tar.c:513 msgid "Select output stream:" msgstr "é¸å–輸出串æµï¼š" -#: src/tar.c:499 +#: src/tar.c:516 msgid "extract files to standard output" msgstr "解開檔案到標準輸出" -#: src/tar.c:500 src/tar.c:582 src/tar.c:584 tests/genfile.c:190 +#: src/tar.c:517 src/tar.c:606 src/tar.c:608 tests/genfile.c:190 msgid "COMMAND" msgstr "命令" -#: src/tar.c:501 +#: src/tar.c:518 msgid "pipe extracted files to another program" msgstr "將解開的檔案管線引導到å¦å¤–的程å¼" -#: src/tar.c:503 +#: src/tar.c:520 msgid "ignore exit codes of children" msgstr "忽略å­è¡Œç¨‹çš„離開代碼" -#: src/tar.c:505 +#: src/tar.c:522 msgid "treat non-zero exit codes of children as error" msgstr "å°‡å­è¡Œç¨‹çš„éžé›¶é›¢é–‹ä»£ç¢¼è¦–為錯誤" -#: src/tar.c:510 +#: src/tar.c:527 msgid "Handling of file attributes:" msgstr "檔案屬性的處ç†:" -#: src/tar.c:513 +#: src/tar.c:530 msgid "force NAME as owner for added files" msgstr "強制以 NAME åšç‚ºåŠ å…¥æª”案的æ“有者" -#: src/tar.c:515 +#: src/tar.c:532 msgid "force NAME as group for added files" msgstr "強制以 NAME åšç‚ºåŠ å…¥æª”案的群組" -#: src/tar.c:516 src/tar.c:736 +#: src/tar.c:533 src/tar.c:768 msgid "DATE-OR-FILE" msgstr "檔案的日期" -#: src/tar.c:517 +#: src/tar.c:534 msgid "set mtime for added files from DATE-OR-FILE" msgstr "將加入檔案的 mtime 設定為 DATE-OR-FILE" -#: src/tar.c:518 +#: src/tar.c:535 msgid "CHANGES" msgstr "變更" -#: src/tar.c:519 +#: src/tar.c:536 msgid "force (symbolic) mode CHANGES for added files" msgstr "強制將 (符號) æ¨¡å¼ CHANGES 用於已加入檔案" -#: src/tar.c:521 +#: src/tar.c:538 msgid "METHOD" msgstr "方法" -#: src/tar.c:522 +#: src/tar.c:539 msgid "" "preserve access times on dumped files, either by restoring the times after " "reading (METHOD='replace'; default) or by not setting the times in the first " @@ -1629,223 +1645,231 @@ msgstr "" "ä¿ç•™å‚¾å°æª”案的存å–時間，若éžç”±è®€å–之後的回復時間(方法='replace'ï¼›é è¨­)，就是" "藉由原本ä¸è¨­å®šæ™‚é–“ (方法='system')" -#: src/tar.c:526 +#: src/tar.c:543 msgid "don't extract file modified time" msgstr "ä¸è¦è§£é–‹æª”案的修改時間" -#: src/tar.c:528 +#: src/tar.c:545 msgid "" "try extracting files with the same ownership as exists in the archive " "(default for superuser)" msgstr "嘗試以與存在於å°å­˜ä¸­çš„相åŒæ“有屬性來抽出檔案 (é è¨­ç”¨æ–¼ç³»çµ±ç®¡ç†è€…)" -#: src/tar.c:530 +#: src/tar.c:547 msgid "extract files as yourself (default for ordinary users)" msgstr "以您自己æ“有的屬性來抽出檔案 (é è¨­ç”¨æ–¼ä¸€èˆ¬ä½¿ç”¨è€…)" -#: src/tar.c:532 +#: src/tar.c:549 msgid "always use numbers for user/group names" msgstr "總是使用數字åšç‚ºä½¿ç”¨è€…/群組å稱" -#: src/tar.c:534 +#: src/tar.c:551 msgid "extract information about file permissions (default for superuser)" msgstr "解開檔案權é™ç›¸é—œè³‡è¨Š (é è¨­ç”¨æ–¼è¶…級使用者)" -#: src/tar.c:538 +#: src/tar.c:555 msgid "" "apply the user's umask when extracting permissions from the archive (default " "for ordinary users)" msgstr "從å°å­˜è§£é–‹æ¬Šé™æ™‚套用使用者 umask (é è¨­ç”¨æ–¼ä¸€èˆ¬ä½¿ç”¨è€…)" -#: src/tar.c:540 +#: src/tar.c:557 msgid "" "member arguments are listed in the same order as the files in the archive" msgstr "" -#: src/tar.c:544 +#: src/tar.c:561 msgid "same as both -p and -s" msgstr "ç­‰åŒæ–¼æŒ‡å®š -p 與 -s" -#: src/tar.c:546 +#: src/tar.c:563 msgid "" "delay setting modification times and permissions of extracted directories " "until the end of extraction" msgstr "延é²è¨­å®šè§£é–‹ç›®éŒ„的修改時間和權é™ï¼Œç›´åˆ°è§£é–‹çµæŸ" -#: src/tar.c:549 +#: src/tar.c:566 msgid "cancel the effect of --delay-directory-restore option" msgstr "å–消 --delay-directory-restore é¸é …的效果" -#: src/tar.c:554 +#: src/tar.c:567 +msgid "ORDER" +msgstr "" + +#: src/tar.c:571 +msgid "directory sorting order: none (default) or name" +msgstr "" + +#: src/tar.c:578 #, fuzzy msgid "Handling of extended file attributes:" msgstr "檔案屬性的處ç†:" -#: src/tar.c:557 +#: src/tar.c:581 msgid "Enable extended attributes support" msgstr "" -#: src/tar.c:559 +#: src/tar.c:583 msgid "Disable extended attributes support" msgstr "" -#: src/tar.c:560 src/tar.c:562 +#: src/tar.c:584 src/tar.c:586 msgid "MASK" msgstr "" -#: src/tar.c:561 +#: src/tar.c:585 msgid "specify the include pattern for xattr keys" msgstr "" -#: src/tar.c:563 +#: src/tar.c:587 msgid "specify the exclude pattern for xattr keys" msgstr "" -#: src/tar.c:565 +#: src/tar.c:589 msgid "Enable the SELinux context support" msgstr "" -#: src/tar.c:567 +#: src/tar.c:591 msgid "Disable the SELinux context support" msgstr "" -#: src/tar.c:569 +#: src/tar.c:593 msgid "Enable the POSIX ACLs support" msgstr "" -#: src/tar.c:571 +#: src/tar.c:595 msgid "Disable the POSIX ACLs support" msgstr "" -#: src/tar.c:576 +#: src/tar.c:600 msgid "Device selection and switching:" msgstr "è£ç½®é¸æ“‡èˆ‡åˆ‡æ›ï¼š" -#: src/tar.c:578 +#: src/tar.c:602 msgid "ARCHIVE" msgstr "å°å­˜" -#: src/tar.c:579 +#: src/tar.c:603 msgid "use archive file or device ARCHIVE" msgstr "使用 ARCHIVE 檔案或 ARCHIVE è£ç½®" -#: src/tar.c:581 +#: src/tar.c:605 msgid "archive file is local even if it has a colon" msgstr "å³ä½¿å…·æœ‰å†’號，å°å­˜æª”案ä»ä½æ–¼æœ¬åœ°ç«¯" -#: src/tar.c:583 +#: src/tar.c:607 msgid "use given rmt COMMAND instead of rmt" msgstr "使用給定的 rmt COMMAND 以代替 rmt" -#: src/tar.c:585 +#: src/tar.c:609 msgid "use remote COMMAND instead of rsh" msgstr "使用é ç«¯ COMMAND 以代替 rsh" -#: src/tar.c:589 +#: src/tar.c:613 msgid "specify drive and density" msgstr "指定ç£ç¢Ÿæ©Ÿèˆ‡è¨˜éŒ„密度" -#: src/tar.c:603 +#: src/tar.c:627 msgid "create/list/extract multi-volume archive" msgstr "建立/列表/解開 多é‡å·å†Šçš„å°å­˜" -#: src/tar.c:605 +#: src/tar.c:629 msgid "change tape after writing NUMBER x 1024 bytes" msgstr "在寫入 NUMBER x 1024 ä½å…ƒçµ„之後更æ›ç£å¸¶" -#: src/tar.c:607 +#: src/tar.c:631 msgid "run script at end of each tape (implies -M)" msgstr "在æ¯å·ç£å¸¶æœ«ç«¯åŸ·è¡Œå‘½ä»¤ç¨¿ (æ„指 -M)" -#: src/tar.c:610 +#: src/tar.c:634 msgid "use/update the volume number in FILE" msgstr "使用/æ›´æ–° FILE 中的å·å†Šè™Ÿç¢¼" -#: src/tar.c:615 +#: src/tar.c:639 msgid "Device blocking:" msgstr "è£ç½®åˆ†å€:" -#: src/tar.c:617 +#: src/tar.c:641 msgid "BLOCKS" msgstr "å€å¡Š" -#: src/tar.c:618 +#: src/tar.c:642 msgid "BLOCKS x 512 bytes per record" msgstr "æ¯ç­†è¨˜éŒ„å«æœ‰ BLOCKS x 512 ä½å…ƒçµ„" -#: src/tar.c:620 +#: src/tar.c:644 msgid "NUMBER of bytes per record, multiple of 512" msgstr "æ¯ç­†è¨˜éŒ„ SIZE ä½å…ƒçµ„，為 512 çš„å€æ•¸" -#: src/tar.c:622 +#: src/tar.c:646 msgid "ignore zeroed blocks in archive (means EOF)" msgstr "忽略å°å­˜ä¸­é›¶å€¼çš„å€å¡Š (æ„指 EOF)" -#: src/tar.c:624 +#: src/tar.c:648 msgid "reblock as we read (for 4.2BSD pipes)" msgstr "讀å–時é‡æ–°åˆ†å€ (用於 4.2BSD 管線)" -#: src/tar.c:629 +#: src/tar.c:653 msgid "Archive format selection:" msgstr "å°å­˜æ ¼å¼é¸æ“‡ï¼š" -#: src/tar.c:631 tests/genfile.c:153 +#: src/tar.c:655 tests/genfile.c:153 msgid "FORMAT" msgstr "æ ¼å¼" -#: src/tar.c:632 +#: src/tar.c:656 msgid "create archive of the given format" msgstr "以給定格å¼å»ºç«‹å°å­˜" -#: src/tar.c:634 +#: src/tar.c:658 msgid "FORMAT is one of the following:" msgstr "符åˆä¸‹åˆ—任一 FORMAT：" -#: src/tar.c:635 +#: src/tar.c:659 msgid "old V7 tar format" msgstr "èˆŠå¼ V7 tar æ ¼å¼" -#: src/tar.c:638 +#: src/tar.c:662 msgid "GNU format as per tar <= 1.12" msgstr "tar <= 1.12 之 GNU æ ¼å¼" -#: src/tar.c:640 +#: src/tar.c:664 msgid "GNU tar 1.13.x format" msgstr "GNU tar 1.13.x æ ¼å¼" -#: src/tar.c:642 +#: src/tar.c:666 msgid "POSIX 1003.1-1988 (ustar) format" msgstr "POSIX 1003.1-1988 (ustar) æ ¼å¼" -#: src/tar.c:644 +#: src/tar.c:668 msgid "POSIX 1003.1-2001 (pax) format" msgstr "POSIX 1003.1-2001 (pax) æ ¼å¼" -#: src/tar.c:645 +#: src/tar.c:669 msgid "same as pax" msgstr "ç­‰åŒ pax" -#: src/tar.c:648 +#: src/tar.c:672 msgid "same as --format=v7" msgstr "ç­‰åŒ --format=v7" -#: src/tar.c:651 +#: src/tar.c:675 msgid "same as --format=posix" msgstr "ç­‰åŒ --format=posix" -#: src/tar.c:652 +#: src/tar.c:676 msgid "keyword[[:]=value][,keyword[[:]=value]]..." msgstr "é—œéµå­—[[:]=值][,é—œéµå­—[[:]=值]…]" -#: src/tar.c:653 +#: src/tar.c:677 msgid "control pax keywords" msgstr "控制 pax çš„é—œéµå­—" -#: src/tar.c:654 +#: src/tar.c:678 msgid "TEXT" msgstr "文字" -#: src/tar.c:655 +#: src/tar.c:679 msgid "" "create archive with volume name TEXT; at list/extract time, use TEXT as a " "globbing pattern for volume name" @@ -1853,167 +1877,179 @@ msgstr "" "以å·å†Šå稱 NAME 來建立å°å­˜ã€‚在列表/解開時，使用 TEXT åšç‚ºå·å†Šå稱的è¬ç”¨æ¯”å°èƒš" "騰" -#: src/tar.c:660 +#: src/tar.c:684 msgid "Compression options:" msgstr "壓縮é¸é …：" -#: src/tar.c:662 +#: src/tar.c:686 msgid "use archive suffix to determine the compression program" msgstr "利用å°å­˜å­—尾決定壓縮程å¼" -#: src/tar.c:664 +#: src/tar.c:688 msgid "do not use archive suffix to determine the compression program" msgstr "ä¸åˆ©ç”¨å°å­˜å­—尾決定壓縮程å¼" -#: src/tar.c:666 +#: src/tar.c:690 msgid "PROG" msgstr "程å¼" -#: src/tar.c:667 +#: src/tar.c:691 msgid "filter through PROG (must accept -d)" msgstr "以 PROG éŽæ¿¾è™•ç† (å¿…é ˆæŽ¥å— -d)" -#: src/tar.c:683 +#: src/tar.c:707 msgid "Local file selection:" msgstr "本機檔案é¸æ“‡:" -#: src/tar.c:686 +#: src/tar.c:710 msgid "add given FILE to the archive (useful if its name starts with a dash)" msgstr "將給定的 FILE 加入å°å­˜ (如果它的å稱以減號開始時就很有用)" -#: src/tar.c:687 -msgid "DIR" -msgstr "目錄" - -#: src/tar.c:688 +#: src/tar.c:712 msgid "change to directory DIR" msgstr "更改至目錄 DIR" -#: src/tar.c:690 +#: src/tar.c:714 msgid "get names to extract or create from FILE" msgstr "從 FILE 中å–å¾—è¦è§£é–‹æˆ–建立的å稱" -#: src/tar.c:692 +#: src/tar.c:716 msgid "-T reads null-terminated names, disable -C" msgstr "-T 讀å–零值終çµçš„å稱，åœç”¨ -C" -#: src/tar.c:694 +#: src/tar.c:718 msgid "disable the effect of the previous --null option" msgstr "åœç”¨å…ˆå‰ --null é¸é …的效果" -#: src/tar.c:696 -msgid "unquote filenames read with -T (default)" +#: src/tar.c:720 +#, fuzzy +msgid "unquote input file or member names (default)" msgstr "去除以 -T 讀å–的檔å引號 (é è¨­)" -#: src/tar.c:698 -msgid "do not unquote filenames read with -T" +#: src/tar.c:722 +#, fuzzy +msgid "do not unquote input file or member names" msgstr "ä¸åŽ»é™¤ä»¥ -T 讀å–的檔å引號" -#: src/tar.c:699 tests/genfile.c:136 +#: src/tar.c:723 tests/genfile.c:136 msgid "PATTERN" msgstr "胚騰" -#: src/tar.c:700 +#: src/tar.c:724 msgid "exclude files, given as a PATTERN" msgstr "排除給定胚騰的檔案" -#: src/tar.c:702 +#: src/tar.c:726 msgid "exclude patterns listed in FILE" msgstr "排除 FILE 中所列出的胚騰" -#: src/tar.c:704 +#: src/tar.c:728 msgid "" "exclude contents of directories containing CACHEDIR.TAG, except for the tag " "file itself" msgstr "æŽ’é™¤åŒ…å« CACHEDIR.TAG 的目錄內容，除了該標記檔案本身" -#: src/tar.c:707 +#: src/tar.c:731 msgid "exclude everything under directories containing CACHEDIR.TAG" msgstr "æŽ’é™¤åŒ…å« CACHEDIR.TAG 的目錄之下所有æ±è¥¿" -#: src/tar.c:710 +#: src/tar.c:734 msgid "exclude directories containing CACHEDIR.TAG" msgstr "æŽ’é™¤åŒ…å« CACHEDIR.TAG 的目錄" -#: src/tar.c:712 +#: src/tar.c:736 msgid "exclude contents of directories containing FILE, except for FILE itself" msgstr "æŽ’é™¤åŒ…å« FILE 的目錄內容，除了該檔案本身" -#: src/tar.c:715 +#: src/tar.c:739 +msgid "read exclude patterns for each directory from FILE, if it exists" +msgstr "" + +#: src/tar.c:742 +msgid "" +"read exclude patterns for each directory and its subdirectories from FILE, " +"if it exists" +msgstr "" + +#: src/tar.c:745 msgid "exclude everything under directories containing FILE" msgstr "æŽ’é™¤åŒ…å« FILE 的目錄之下所有æ±è¥¿" -#: src/tar.c:717 +#: src/tar.c:747 msgid "exclude directories containing FILE" msgstr "æŽ’é™¤åŒ…å« FILE 的目錄" -#: src/tar.c:719 +#: src/tar.c:749 msgid "exclude version control system directories" msgstr "排除版本控制系統目錄" -#: src/tar.c:721 +#: src/tar.c:751 +msgid "read exclude patterns from the VCS ignore files" +msgstr "" + +#: src/tar.c:753 msgid "exclude backup and lock files" msgstr "排除備份和鎖定檔案" -#: src/tar.c:723 +#: src/tar.c:755 msgid "avoid descending automatically in directories" msgstr "é¿å…自動在目錄中éžé™" -#: src/tar.c:725 +#: src/tar.c:757 msgid "stay in local file system when creating archive" msgstr "建立å°å­˜æ™‚ä¿æŒåœ¨æœ¬åœ°æª”案系統中" -#: src/tar.c:727 +#: src/tar.c:759 msgid "recurse into directories (default)" msgstr "éžè¿´é€²å…¥ç›®éŒ„ (é è¨­)" -#: src/tar.c:729 +#: src/tar.c:761 #, fuzzy msgid "don't strip leading '/'s from file names" msgstr "ä¸è¦å¾žæª”案å稱中截去å‰å°Žçš„ '/'" -#: src/tar.c:731 +#: src/tar.c:763 msgid "follow symlinks; archive and dump the files they point to" msgstr "跟隨符號連çµï¼›å°å­˜å’Œå‚¾å°å®ƒå€‘所指涉的檔案" -#: src/tar.c:733 +#: src/tar.c:765 msgid "follow hard links; archive and dump the files they refer to" msgstr "跟隨硬å¼é€£çµï¼›å°å­˜å’Œå‚¾å°å®ƒå€‘所åƒè€ƒçš„檔案" -#: src/tar.c:734 +#: src/tar.c:766 msgid "MEMBER-NAME" msgstr "æˆå“¡-å稱" -#: src/tar.c:735 +#: src/tar.c:767 #, fuzzy msgid "begin at member MEMBER-NAME when reading the archive" msgstr "從å°å­˜ä¸­å為 MEMBER-NAME çš„æˆå“¡é–‹å§‹" -#: src/tar.c:737 +#: src/tar.c:769 msgid "only store files newer than DATE-OR-FILE" msgstr "åªå„²å­˜æ¯” DATE-OF-FILE 還新的檔案" -#: src/tar.c:739 +#: src/tar.c:771 msgid "DATE" msgstr "日期" -#: src/tar.c:740 +#: src/tar.c:772 msgid "compare date and time when data changed only" msgstr "åªæœ‰ç•¶è³‡æ–™è®Šæ›´æ™‚æ‰æ¯”較日期和時間" -#: src/tar.c:741 +#: src/tar.c:773 msgid "CONTROL" msgstr "控制" -#: src/tar.c:742 +#: src/tar.c:774 msgid "backup before removal, choose version CONTROL" msgstr "移除之å‰å…ˆå‚™ä»½ï¼Œé¸æ“‡ç‰ˆæœ¬ CONTROL" -#: src/tar.c:743 src/tar.c:824 src/tar.c:826 tests/genfile.c:169 +#: src/tar.c:775 src/tar.c:856 src/tar.c:858 tests/genfile.c:169 msgid "STRING" msgstr "字串" -#: src/tar.c:744 +#: src/tar.c:776 msgid "" "backup before removal, override usual suffix ('~' unless overridden by " "environment variable SIMPLE_BACKUP_SUFFIX)" @@ -2021,98 +2057,98 @@ msgstr "" "移除之å‰å…ˆå‚™ä»½ä¸¦è¦†å¯«å¸¸ç”¨å¾Œç½®æ–‡å­— ( ~ 除éžè¢«ç’°å¢ƒè®Šæ•¸ SIMPLE_BACKUP_SUFFIX 所蓋" "éŽ)" -#: src/tar.c:749 +#: src/tar.c:781 msgid "File name transformations:" msgstr "檔案å稱變æ›ï¼š" -#: src/tar.c:751 +#: src/tar.c:783 msgid "strip NUMBER leading components from file names on extraction" msgstr "從檔案å稱中截去以 NUMBER 為首的æˆåˆ†" -#: src/tar.c:753 +#: src/tar.c:785 msgid "EXPRESSION" msgstr "表示å¼" -#: src/tar.c:754 +#: src/tar.c:786 msgid "use sed replace EXPRESSION to transform file names" msgstr "利用 sed å°‡ EXPRESSION 替代為變æ›æª”案å稱" -#: src/tar.c:760 +#: src/tar.c:792 msgid "File name matching options (affect both exclude and include patterns):" msgstr "檔案å稱å»åˆé¸é … (åŒæ™‚影響排除和包å«èƒšé¨°åŒè€…)：" -#: src/tar.c:763 +#: src/tar.c:795 msgid "ignore case" msgstr "忽略大å°å¯«" -#: src/tar.c:765 +#: src/tar.c:797 msgid "patterns match file name start" msgstr "å»åˆæª”案å稱開頭的胚騰" -#: src/tar.c:767 +#: src/tar.c:799 #, fuzzy msgid "patterns match after any '/' (default for exclusion)" msgstr "胚騰å»åˆä»»ä½• / 之後的胚騰 (é è¨­æŽ’除)" -#: src/tar.c:769 +#: src/tar.c:801 msgid "case sensitive matching (default)" msgstr "大å°å¯«éœ€ç›¸ç¬¦çš„å»åˆ (é è¨­)" -#: src/tar.c:771 +#: src/tar.c:803 msgid "use wildcards (default for exclusion)" msgstr "使用è¬ç”¨å­—å…ƒ (é è¨­æŽ’除)" -#: src/tar.c:773 +#: src/tar.c:805 msgid "verbatim string matching" msgstr "é€å­—進行å»åˆ" -#: src/tar.c:775 +#: src/tar.c:807 #, fuzzy msgid "wildcards do not match '/'" msgstr "è¬ç”¨å­—å…ƒä¸æœƒå»åˆ /" -#: src/tar.c:777 +#: src/tar.c:809 #, fuzzy msgid "wildcards match '/' (default for exclusion)" msgstr "è¬ç”¨å­—元會å»åˆ / (é è¨­æŽ’除)" -#: src/tar.c:782 +#: src/tar.c:814 msgid "Informative output:" msgstr "富å«è³‡è¨Šçš„輸出:" -#: src/tar.c:785 +#: src/tar.c:817 msgid "verbosely list files processed" msgstr "詳細列出處ç†éŽçš„檔案" -#: src/tar.c:786 +#: src/tar.c:818 msgid "KEYWORD" msgstr "é—œéµå­—" -#: src/tar.c:787 +#: src/tar.c:819 msgid "warning control" msgstr "警告控制" -#: src/tar.c:789 +#: src/tar.c:821 msgid "display progress messages every NUMBERth record (default 10)" msgstr "æ¯å¹¾é …è¨˜éŒ„é¡¯ç¤ºä¸€æ¬¡é€²åº¦è¨Šæ¯ (é è¨­ 10)" -#: src/tar.c:791 +#: src/tar.c:823 msgid "ACTION" msgstr "動作" -#: src/tar.c:792 +#: src/tar.c:824 msgid "execute ACTION on each checkpoint" msgstr "æ–¼æ¯å€‹æŸ¥æ ¸é»žåŸ·è¡Œ ACTION" -#: src/tar.c:795 +#: src/tar.c:827 msgid "print a message if not all links are dumped" msgstr "如果並éžæ‰€æœ‰é€£çµéƒ½è¢«å‚¾å°å‰‡å°å‡ºè¨Šæ¯" -#: src/tar.c:796 +#: src/tar.c:828 msgid "SIGNAL" msgstr "信號" -#: src/tar.c:797 +#: src/tar.c:829 msgid "" "print total bytes after processing the archive; with an argument - print " "total bytes when this SIGNAL is delivered; Allowed signals are: SIGHUP, " @@ -2123,119 +2159,119 @@ msgstr "" "的信號是：SIGHUPã€SIGQUITã€SIGINTã€SIGUSR1 å’Œ SIGUSR2ï¼›ä¸å…· SIG å‰ç¶´çš„å稱也" "是å¯æŽ¥å—çš„" -#: src/tar.c:802 +#: src/tar.c:834 msgid "print file modification times in UTC" msgstr "以 UTC å°å‡ºæª”案修改時間" -#: src/tar.c:804 +#: src/tar.c:836 msgid "print file time to its full resolution" msgstr "以完整精度å°å‡ºæª”案時間" -#: src/tar.c:806 +#: src/tar.c:838 msgid "send verbose output to FILE" msgstr "將詳細輸出é€è‡³ FILE" -#: src/tar.c:808 +#: src/tar.c:840 msgid "show block number within archive with each message" msgstr "æ¯å‰‡è¨Šæ¯é™„帶顯示在å°å­˜ä¸­çš„å€å¡Šè™Ÿç¢¼" -#: src/tar.c:810 +#: src/tar.c:842 msgid "ask for confirmation for every action" msgstr "任何動作都è¦æ±‚確èª" -#: src/tar.c:813 +#: src/tar.c:845 msgid "show tar defaults" msgstr "顯示 tar é è¨­å€¼" -#: src/tar.c:815 +#: src/tar.c:847 msgid "show valid ranges for snapshot-file fields" msgstr "" -#: src/tar.c:817 +#: src/tar.c:849 msgid "" "when listing or extracting, list each directory that does not match search " "criteria" msgstr "當表列或解開時，列出æ¯ä¸€å€‹ä¸ç¬¦åˆæœå°‹æ¢ä»¶çš„目錄" -#: src/tar.c:819 +#: src/tar.c:851 msgid "show file or archive names after transformation" msgstr "顯示變æ›ä¹‹å¾Œçš„檔案或å°å­˜å稱" -#: src/tar.c:822 +#: src/tar.c:854 msgid "STYLE" msgstr "樣å¼" -#: src/tar.c:823 +#: src/tar.c:855 msgid "set name quoting style; see below for valid STYLE values" msgstr "設定å稱引號樣å¼ï¼›åƒçœ‹ä¸‹åˆ—的有效樣å¼å€¼" -#: src/tar.c:825 +#: src/tar.c:857 msgid "additionally quote characters from STRING" msgstr "來自 STRING çš„é¡å¤–引號字元" -#: src/tar.c:827 +#: src/tar.c:859 msgid "disable quoting for characters from STRING" msgstr "åœç”¨ä¾†è‡ªå­—串的引號字元" -#: src/tar.c:832 +#: src/tar.c:864 msgid "Compatibility options:" msgstr "相容é¸é …：" -#: src/tar.c:835 +#: src/tar.c:867 msgid "" "when creating, same as --old-archive; when extracting, same as --no-same-" "owner" msgstr "當建立時，等åŒæ–¼ --old-archive。當解開時，等åŒæ–¼ --no-same-owner" -#: src/tar.c:840 +#: src/tar.c:872 msgid "Other options:" msgstr "其他é¸é …：" -#: src/tar.c:843 +#: src/tar.c:875 msgid "disable use of some potentially harmful options" msgstr "åœç”¨æŸäº›æ½›åœ¨æœ‰å®³çš„é¸é …" -#: src/tar.c:978 +#: src/tar.c:1010 #, fuzzy msgid "" "You may not specify more than one '-Acdtrux', '--delete' or '--test-label' " "option" msgstr "您ä¸å¯ä»¥æŒ‡å®šè¶…éŽä¸€å€‹ -Acdtrux 或 --test-label é¸é …" -#: src/tar.c:988 +#: src/tar.c:1020 msgid "Conflicting compression options" msgstr "互相抵觸的壓縮é¸é …" -#: src/tar.c:1047 +#: src/tar.c:1079 #, c-format msgid "Unknown signal name: %s" msgstr "ä¸æ˜Žçš„信號å稱：%s" -#: src/tar.c:1071 +#: src/tar.c:1103 msgid "Date sample file not found" msgstr "找ä¸åˆ°æ—¥æœŸç¯„例檔案" -#: src/tar.c:1079 +#: src/tar.c:1111 #, c-format msgid "Substituting %s for unknown date format %s" msgstr "以 %s 代替ä¸æ˜Žçš„æ—¥æœŸæ ¼å¼ %s" -#: src/tar.c:1108 +#: src/tar.c:1140 #, fuzzy, c-format msgid "Option %s: Treating date '%s' as %s" msgstr "é¸é … %1$s: 以 %3$s æ ¼å¼ä¾†è™•ç†æ—¥æœŸ %2$s" -#: src/tar.c:1151 src/tar.c:1155 src/tar.c:1159 src/tar.c:1163 src/tar.c:1167 -#: src/tar.c:1171 +#: src/tar.c:1183 src/tar.c:1187 src/tar.c:1191 src/tar.c:1195 src/tar.c:1199 +#: src/tar.c:1203 src/tar.c:1206 #, c-format msgid "filter the archive through %s" msgstr "å°‡å°å­˜é€éŽ %s 篩é¸" -#: src/tar.c:1179 +#: src/tar.c:1214 msgid "Valid arguments for the --quoting-style option are:" msgstr "用於 --quoting-style 的有效引數é¸é …是：" -#: src/tar.c:1183 +#: src/tar.c:1218 msgid "" "\n" "*This* tar defaults to:\n" @@ -2243,48 +2279,48 @@ msgstr "" "\n" "*這個* tar é è¨­ç‚º:\n" -#: src/tar.c:1295 +#: src/tar.c:1330 #, fuzzy msgid "Invalid owner or group ID" msgstr "無效的æ“有者" -#: src/tar.c:1339 +#: src/tar.c:1389 msgid "Invalid blocking factor" msgstr "無效的分å€å› å­" -#: src/tar.c:1452 +#: src/tar.c:1507 msgid "Invalid tape length" msgstr "無效的ç£å¸¶é•·åº¦" -#: src/tar.c:1466 +#: src/tar.c:1521 msgid "Invalid incremental level value" msgstr "無效的éžå¢žç­‰ç´šå€¼" -#: src/tar.c:1512 +#: src/tar.c:1567 msgid "More than one threshold date" msgstr "一個以上的é™å®šæ—¥æœŸ" -#: src/tar.c:1571 src/tar.c:1574 +#: src/tar.c:1626 src/tar.c:1629 msgid "Invalid sparse version value" msgstr "無效的稀ç–版本值" -#: src/tar.c:1659 +#: src/tar.c:1714 msgid "--atime-preserve='system' is not supported on this platform" msgstr "--atime-preserve='system' 於這個平臺未被支æ´" -#: src/tar.c:1684 +#: src/tar.c:1739 msgid "--checkpoint value is not an integer" msgstr "--checkpoint 值ä¸æ˜¯æ•´æ•¸" -#: src/tar.c:1801 +#: src/tar.c:1868 msgid "Invalid mode given on option" msgstr "é¸é …中的模å¼ç„¡æ•ˆ" -#: src/tar.c:1858 +#: src/tar.c:1925 msgid "Invalid number" msgstr "無效的號碼" -#: src/tar.c:1915 +#: src/tar.c:1982 msgid "" "The --preserve option is deprecated, use --preserve-permissions --preserve-" "order instead" @@ -2292,246 +2328,240 @@ msgstr "" "--preserve é¸é …ä¸å®œå†ç”¨ï¼Œè«‹ä»¥ --preserve-permissions --preserve-order åšç‚ºæ›¿" "代" -#: src/tar.c:1926 +#: src/tar.c:1993 msgid "Invalid record size" msgstr "無效的記錄大å°" -#: src/tar.c:1929 +#: src/tar.c:1996 #, c-format msgid "Record size must be a multiple of %d." msgstr "記錄大å°å¿…須是 %d çš„å€æ•¸ã€‚" -#: src/tar.c:1975 +#: src/tar.c:2042 msgid "Invalid number of elements" msgstr "無效的元素號碼" -#: src/tar.c:1995 +#: src/tar.c:2067 msgid "Only one --to-command option allowed" msgstr "åªå…許一個 --to-command é¸é …" -#: src/tar.c:2107 +#: src/tar.c:2179 #, c-format msgid "Malformed density argument: %s" msgstr "異常的密度引數：%s" -#: src/tar.c:2133 +#: src/tar.c:2205 #, fuzzy, c-format msgid "Unknown density: '%c'" msgstr "ä¸æ˜Žçš„密度：%c" -#: src/tar.c:2150 +#: src/tar.c:2222 #, fuzzy, c-format msgid "Options '-[0-7][lmh]' not supported by *this* tar" msgstr "此版本的 tar ä¸æ”¯æ´ -[0-7][lmh] é¸é …" -#: src/tar.c:2163 +#: src/tar.c:2235 msgid "[FILE]..." msgstr "[FILE]…" -#: src/tar.c:2306 +#. TRANSLATORS: Both %s in this statement are replaced with +#. option names. +#: src/tar.c:2303 +#, fuzzy, c-format +msgid "'%s' cannot be used with '%s'" +msgstr "胚騰 %s 無法使用" + +#: src/tar.c:2389 #, fuzzy, c-format msgid "Old option '%c' requires an argument." msgstr "舊的é¸é … %c 需è¦ä¸€å€‹å¼•æ•¸ã€‚" -#: src/tar.c:2386 +#: src/tar.c:2469 msgid "--occurrence is meaningless without a file list" msgstr "若無檔案列表，--occurrence 便ä¸å…·æ„義" -#: src/tar.c:2389 -#, fuzzy, c-format -msgid "--occurrence cannot be used with %s" -msgstr "--occurrence 無法於è¦æ±‚的作業模å¼ä¸­ä½¿ç”¨" - -#: src/tar.c:2408 +#: src/tar.c:2490 #, fuzzy msgid "Multiple archive files require '-M' option" msgstr "指定多個å°å­˜æ™‚éœ€è¦ -M é¸é …" -#: src/tar.c:2413 -msgid "Cannot combine --listed-incremental with --newer" -msgstr "無法åŒæ™‚使用 --listed-incremental åŠ --newer" - -#: src/tar.c:2416 +#: src/tar.c:2498 msgid "--level is meaningless without --listed-incremental" msgstr "--level ä¸èˆ‡ --listed-incremental 共用是無æ„義的" -#: src/tar.c:2433 +#: src/tar.c:2515 #, c-format msgid "%s: Volume label is too long (limit is %lu byte)" msgid_plural "%s: Volume label is too long (limit is %lu bytes)" msgstr[0] "%s：å·å†Šæ¨™ç±¤å¤ªé•· (é™åˆ¶ç‚º %lu ä½å…ƒçµ„)" -#: src/tar.c:2446 +#: src/tar.c:2528 msgid "Cannot verify multi-volume archives" msgstr "無法驗證多é‡å·å†Šçš„å°å­˜" -#: src/tar.c:2448 +#: src/tar.c:2530 msgid "Cannot verify compressed archives" msgstr "無法驗證壓縮éŽçš„å°å­˜" -#: src/tar.c:2450 -#, fuzzy, c-format -msgid "--verify cannot be used with %s" -msgstr "胚騰 %s 無法使用" - -#: src/tar.c:2457 +#: src/tar.c:2539 msgid "Cannot use multi-volume compressed archives" msgstr "無法使用多é‡å·å†Šçš„壓縮å°å­˜" -#: src/tar.c:2461 +#: src/tar.c:2543 msgid "Cannot concatenate compressed archives" msgstr "無法串接壓縮éŽçš„檔案" -#: src/tar.c:2471 +#: src/tar.c:2553 msgid "--pax-option can be used only on POSIX archives" msgstr "--pax-option åªèƒ½ç”¨æ–¼ POSIX å°å­˜" -#: src/tar.c:2478 +#: src/tar.c:2560 #, fuzzy msgid "--acls can be used only on POSIX archives" msgstr "--pax-option åªèƒ½ç”¨æ–¼ POSIX å°å­˜" -#: src/tar.c:2483 +#: src/tar.c:2565 #, fuzzy msgid "--selinux can be used only on POSIX archives" msgstr "--pax-option åªèƒ½ç”¨æ–¼ POSIX å°å­˜" -#: src/tar.c:2488 +#: src/tar.c:2570 #, fuzzy msgid "--xattrs can be used only on POSIX archives" msgstr "--pax-option åªèƒ½ç”¨æ–¼ POSIX å°å­˜" -#: src/tar.c:2493 -#, fuzzy, c-format -msgid "--%s option cannot be used with %s" -msgstr "胚騰 %s 無法使用" +#: src/tar.c:2597 +msgid "" +"Cannot deduce top-level directory name; please set it explicitly with --one-" +"top-level=DIR" +msgstr "" -#: src/tar.c:2525 +#: src/tar.c:2630 msgid "Volume length cannot be less than record size" msgstr "å·å†Šé•·åº¦ç„¡æ³•å°‘於記錄大å°" -#: src/tar.c:2528 -msgid "--preserve-order is not compatible with --listed-incremental" -msgstr "--preserve-order 與 --listed-incremental ä¸ç›¸å®¹" - -#: src/tar.c:2539 +#: src/tar.c:2643 msgid "Cowardly refusing to create an empty archive" msgstr "低調拒絕建立空白的å°å­˜" -#: src/tar.c:2565 +#: src/tar.c:2669 #, fuzzy msgid "Options '-Aru' are incompatible with '-f -'" msgstr " -Aru 與 -f - é¸é …ä¸ç›¸å®¹" -#: src/tar.c:2660 +#: src/tar.c:2766 #, fuzzy msgid "" "You must specify one of the '-Acdtrux', '--delete' or '--test-label' options" msgstr "您必須指定 -Acdtrux 或 --test-label é¸é …之一" -#: src/tar.c:2715 +#: src/tar.c:2823 #, c-format msgid "Exiting with failure status due to previous errors" msgstr "由於先å‰éŒ¯èª¤è€Œä»¥å¤±æ•—狀態離開" +#: src/tar.c:569 +msgid "directory sorting order: none (default), name or inode" +msgstr "" + #: src/update.c:87 #, c-format msgid "%s: File shrank by %s byte" msgid_plural "%s: File shrank by %s bytes" msgstr[0] "%s：檔案縮減了 %s ä½å…ƒçµ„" -#: src/xheader.c:164 +#: src/xheader.c:165 #, c-format msgid "Keyword %s is unknown or not yet implemented" msgstr "é—œéµå­— %s 為未知或尚未實作" -#: src/xheader.c:173 +#: src/xheader.c:174 msgid "Time stamp is out of allowed range" msgstr "時間戳記超出了å…許範åœ" -#: src/xheader.c:204 +#: src/xheader.c:205 #, c-format msgid "Pattern %s cannot be used" msgstr "胚騰 %s 無法使用" -#: src/xheader.c:218 +#: src/xheader.c:219 #, c-format msgid "Keyword %s cannot be overridden" msgstr "é—œéµå­— %s 無法被蓋éŽ" -#: src/xheader.c:667 +#: src/xheader.c:668 msgid "Malformed extended header: missing length" msgstr "異常的擴充標頭：長度缺少" -#: src/xheader.c:676 +#: src/xheader.c:677 #, c-format msgid "Extended header length %*s is out of range" msgstr "擴充標頭長度 %*s 超出範åœ" -#: src/xheader.c:688 +#: src/xheader.c:689 msgid "Malformed extended header: missing blank after length" msgstr "異常的擴充標頭：在長度之後缺少空白" -#: src/xheader.c:696 +#: src/xheader.c:697 msgid "Malformed extended header: missing equal sign" msgstr "異常的擴充標頭：缺少等號" -#: src/xheader.c:702 +#: src/xheader.c:703 msgid "Malformed extended header: missing newline" msgstr "異常的擴充標頭：缺少新列" -#: src/xheader.c:740 +#: src/xheader.c:741 #, fuzzy, c-format msgid "Ignoring unknown extended header keyword '%s'" msgstr "忽略ä¸æ˜Žæ“´å……標頭關éµå­— %s" -#: src/xheader.c:1012 +#: src/xheader.c:1013 #, c-format msgid "Generated keyword/value pair is too long (keyword=%s, length=%s)" msgstr "產生的關éµå­—/值å°å¤ªé•· (é—œéµå­—=%s，長度=%s)" #. TRANSLATORS: The first %s is the pax extended header keyword #. (atime, gid, etc.). -#: src/xheader.c:1042 +#: src/xheader.c:1043 #, c-format msgid "Extended header %s=%s is out of range %s..%s" msgstr "擴充標頭 %s=%s è¶…å‡ºç¯„åœ %s..%s" -#: src/xheader.c:1093 src/xheader.c:1126 src/xheader.c:1455 +#: src/xheader.c:1094 src/xheader.c:1127 src/xheader.c:1456 #, c-format msgid "Malformed extended header: invalid %s=%s" msgstr "異常的擴充標頭：無效的 %s=%s" -#: src/xheader.c:1408 src/xheader.c:1433 src/xheader.c:1488 +#: src/xheader.c:1409 src/xheader.c:1434 src/xheader.c:1489 #, c-format msgid "Malformed extended header: excess %s=%s" msgstr "異常的擴充標頭：éŽå‰©çš„ %s=%s" -#: src/xheader.c:1501 +#: src/xheader.c:1502 #, c-format msgid "Malformed extended header: invalid %s: unexpected delimiter %c" msgstr "異常的擴充標頭：無效的 %s：未é æœŸçš„分隔符號 %c" -#: src/xheader.c:1511 +#: src/xheader.c:1512 #, c-format msgid "Malformed extended header: invalid %s: odd number of values" msgstr "異常的擴充標頭：無效的 %s：奇怪的數值數é‡" -#: src/checkpoint.c:109 +#: src/checkpoint.c:114 #, c-format msgid "%s: not a valid timeout" msgstr "%s：ä¸æ˜¯æœ‰æ•ˆçš„時間é™åˆ¶" -#: src/checkpoint.c:114 +#: src/checkpoint.c:121 #, c-format msgid "%s: unknown checkpoint action" msgstr "%s：ä¸æ˜ŽæŸ¥æ ¸é»žå‹•ä½œ" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "write" msgstr "寫入" -#: src/checkpoint.c:134 +#: src/checkpoint.c:202 msgid "read" msgstr "讀å–" @@ -2539,7 +2569,7 @@ msgstr "讀å–" #. *not* "Writing a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de escritura", #. *not* "Escribiendo un punto de comprobaci@'on" -#: src/checkpoint.c:224 +#: src/checkpoint.c:218 #, c-format msgid "Write checkpoint %u" msgstr "寫入的查核點 %u" @@ -2548,7 +2578,7 @@ msgstr "寫入的查核點 %u" #. *not* "Reading a checkpoint". #. E.g. in Spanish "Punto de comprobaci@'on de lectura", #. *not* "Leyendo un punto de comprobaci@'on" -#: src/checkpoint.c:230 +#: src/checkpoint.c:224 #, c-format msgid "Read checkpoint %u" msgstr "讀å–的查核點 %u" @@ -2800,12 +2830,19 @@ msgstr "命令終止\n" msgid "--stat requires file names" msgstr "--stat 需è¦æª”案å稱" -#~ msgid "Cannot get working directory" -#~ msgstr "無法æå–工作目錄" - #~ msgid "sort names to extract to match archive" #~ msgstr "解開時ä¾å稱排åºä»¥ç¬¦åˆå°å­˜" +#, fuzzy +#~ msgid "--occurrence cannot be used with %s" +#~ msgstr "--occurrence 無法於è¦æ±‚的作業模å¼ä¸­ä½¿ç”¨" + +#~ msgid "Cannot combine --listed-incremental with --newer" +#~ msgstr "無法åŒæ™‚使用 --listed-incremental åŠ --newer" + +#~ msgid "--preserve-order is not compatible with --listed-incremental" +#~ msgstr "--preserve-order 與 --listed-incremental ä¸ç›¸å®¹" + #~ msgid "Field too long while reading snapshot file" #~ msgstr "讀å–快照檔時欄ä½å¤ªé•·" @@ -2815,6 +2852,9 @@ msgstr "--stat 需è¦æª”案å稱" #~ msgid "Unexpected field value in snapshot file" #~ msgstr "未é æœŸçš„快照檔欄ä½å€¼" +#~ msgid "Cannot get working directory" +#~ msgstr "無法æå–工作目錄" + #~ msgid "Invalid group" #~ msgstr "無效的群組" diff --git a/rmt/Makefile.in b/rmt/Makefile.in index 8bd42ab..c3f2509 100644 --- a/rmt/Makefile.in +++ b/rmt/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.6 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -51,14 +79,14 @@ build_triplet = @build@ host_triplet = @host@ EXTRA_PROGRAMS = rmt$(EXEEXT) subdir = rmt -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ - $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/alloca.m4 \ - $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/backupfile.m4 \ - $(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/btowc.m4 \ - $(top_srcdir)/m4/canonicalize.m4 \ + $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/acl.m4 \ + $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argp.m4 \ + $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \ + $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/chown.m4 \ $(top_srcdir)/m4/clock_time.m4 \ $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ @@ -70,9 +98,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup.m4 \ $(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/eealloc.m4 \ $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/errno_h.m4 \ - $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exponentd.m4 \ - $(top_srcdir)/m4/extensions.m4 \ - $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fchdir.m4 \ + $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/euidaccess.m4 \ + $(top_srcdir)/m4/exponentd.m4 $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/extern-inline.m4 \ + $(top_srcdir)/m4/faccessat.m4 $(top_srcdir)/m4/fchdir.m4 \ $(top_srcdir)/m4/fchmodat.m4 $(top_srcdir)/m4/fchownat.m4 \ $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl.m4 \ $(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fdopendir.m4 \ @@ -84,19 +113,21 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/m4/getcwd-path-max.m4 $(top_srcdir)/m4/getcwd.m4 \ $(top_srcdir)/m4/getdelim.m4 $(top_srcdir)/m4/getdtablesize.m4 \ - $(top_srcdir)/m4/getline.m4 $(top_srcdir)/m4/getopt.m4 \ - $(top_srcdir)/m4/getpagesize.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gettime.m4 $(top_srcdir)/m4/gettimeofday.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/human.m4 \ + $(top_srcdir)/m4/getgroups.m4 $(top_srcdir)/m4/getline.m4 \ + $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/getpagesize.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettime.m4 \ + $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ + $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 \ + $(top_srcdir)/m4/group-member.m4 $(top_srcdir)/m4/human.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/include_next.m4 \ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \ $(top_srcdir)/m4/inttostr.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ - $(top_srcdir)/m4/iswblank.m4 $(top_srcdir)/m4/langinfo_h.m4 \ - $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lchown.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/isatty.m4 $(top_srcdir)/m4/iswblank.m4 \ + $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ + $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ $(top_srcdir)/m4/link-follow.m4 $(top_srcdir)/m4/link.m4 \ $(top_srcdir)/m4/linkat.m4 $(top_srcdir)/m4/localcharset.m4 \ @@ -122,19 +153,21 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/paxutils.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf.m4 \ - $(top_srcdir)/m4/priv-set.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ - $(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \ - $(top_srcdir)/m4/read.m4 $(top_srcdir)/m4/readdir.m4 \ - $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/readlinkat.m4 \ - $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.m4 \ - $(top_srcdir)/m4/rename.m4 $(top_srcdir)/m4/renameat.m4 \ - $(top_srcdir)/m4/rewinddir.m4 $(top_srcdir)/m4/rmdir.m4 \ - $(top_srcdir)/m4/rmt.m4 $(top_srcdir)/m4/rpmatch.m4 \ - $(top_srcdir)/m4/rtapelib.m4 $(top_srcdir)/m4/safe-read.m4 \ - $(top_srcdir)/m4/safe-write.m4 $(top_srcdir)/m4/save-cwd.m4 \ - $(top_srcdir)/m4/savedir.m4 $(top_srcdir)/m4/secure_getenv.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix_openpt.m4 \ + $(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/priv-set.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/ptsname.m4 \ + $(top_srcdir)/m4/ptsname_r.m4 $(top_srcdir)/m4/quote.m4 \ + $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/raise.m4 \ + $(top_srcdir)/m4/rawmemchr.m4 $(top_srcdir)/m4/read.m4 \ + $(top_srcdir)/m4/readdir.m4 $(top_srcdir)/m4/readlink.m4 \ + $(top_srcdir)/m4/readlinkat.m4 $(top_srcdir)/m4/realloc.m4 \ + $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rename.m4 \ + $(top_srcdir)/m4/renameat.m4 $(top_srcdir)/m4/rewinddir.m4 \ + $(top_srcdir)/m4/rmdir.m4 $(top_srcdir)/m4/rmt.m4 \ + $(top_srcdir)/m4/rpmatch.m4 $(top_srcdir)/m4/rtapelib.m4 \ + $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/safe-write.m4 \ + $(top_srcdir)/m4/save-cwd.m4 $(top_srcdir)/m4/savedir.m4 \ + $(top_srcdir)/m4/secure_getenv.m4 \ $(top_srcdir)/m4/selinux-context-h.m4 \ $(top_srcdir)/m4/selinux-selinux-h.m4 \ $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/signal_h.m4 \ @@ -147,20 +180,23 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \ $(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \ - $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strings_h.m4 $(top_srcdir)/m4/strndup.m4 \ - $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strtol.m4 \ - $(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \ - $(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/symlink.m4 \ - $(top_srcdir)/m4/symlinkat.m4 $(top_srcdir)/m4/sys_socket_h.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strftime.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \ + $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ + $(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \ + $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \ + $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \ + $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/symlinkat.m4 \ + $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sysexits.m4 \ $(top_srcdir)/m4/system.m4 $(top_srcdir)/m4/tempname.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ - $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \ - $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkat.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \ + $(top_srcdir)/m4/ttyname_r.m4 $(top_srcdir)/m4/unistd-safer.m4 \ + $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ + $(top_srcdir)/m4/unlinkat.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/unlockpt.m4 \ $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utimens.m4 \ $(top_srcdir)/m4/utimensat.m4 $(top_srcdir)/m4/utimes.m4 \ $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ @@ -222,6 +258,23 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -792,6 +845,7 @@ LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@ LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ LIB_ACL = @LIB_ACL@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_EACCESS = @LIB_EACCESS@ LIB_SELINUX = @LIB_SELINUX@ LIB_SETSOCKOPT = @LIB_SETSOCKOPT@ LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ @@ -907,11 +961,13 @@ REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ +REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ +REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ @@ -920,6 +976,7 @@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ REPLACE_LOCALECONV = @REPLACE_LOCALECONV@ +REPLACE_LOCALTIME = @REPLACE_LOCALTIME@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ REPLACE_LSTAT = @REPLACE_LSTAT@ @@ -986,6 +1043,7 @@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOD = @REPLACE_STRTOD@ REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ +REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ @@ -1013,6 +1071,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ RSH = @RSH@ +SED = @SED@ SELINUX_CONTEXT_H = @SELINUX_CONTEXT_H@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -1050,6 +1109,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -1094,6 +1154,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1151,10 +1212,11 @@ install-rmtPROGRAMS: $(rmt_PROGRAMS) fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -1175,7 +1237,8 @@ uninstall-rmtPROGRAMS: @list='$(rmt_PROGRAMS)'; test -n "$(rmtdir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(rmtdir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(rmtdir)" && rm -f $$files @@ -1198,6 +1261,7 @@ installcheck-rmtPROGRAMS: $(rmt_PROGRAMS) else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ done; \ done; rm -f c$${pid}_.???; exit $$bad + rmt$(EXEEXT): $(rmt_OBJECTS) $(rmt_DEPENDENCIES) $(EXTRA_rmt_DEPENDENCIES) @rm -f rmt$(EXEEXT) $(AM_V_CCLD)$(LINK) $(rmt_OBJECTS) $(rmt_LDADD) $(LIBS) @@ -1215,35 +1279,24 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1255,15 +1308,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1272,9 +1321,10 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -1428,18 +1478,19 @@ uninstall-am: uninstall-rmtPROGRAMS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-rmtPROGRAMS cscopelist ctags distclean distclean-compile \ - distclean-generic distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-rmtPROGRAMS install-strip \ - installcheck installcheck-am installcheck-rmtPROGRAMS \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ - ps ps-am tags uninstall uninstall-am uninstall-rmtPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-rmtPROGRAMS cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-rmtPROGRAMS \ + install-strip installcheck installcheck-am \ + installcheck-rmtPROGRAMS installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-rmtPROGRAMS rmt.o: ../gnu/configmake.h diff --git a/scripts/Makefile.am b/scripts/Makefile.am index bff8dbe..7484ff8 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -1,6 +1,6 @@ # Make GNU tar scripts. -# Copyright 2004, 2006, 2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 86fa784..57c0d0d 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.6 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,7 @@ # Make GNU tar scripts. -# Copyright 2004, 2006, 2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. @@ -34,23 +34,51 @@ # along with this program. If not, see . VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -69,13 +97,13 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = scripts -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ - $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/alloca.m4 \ - $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/backupfile.m4 \ - $(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/btowc.m4 \ - $(top_srcdir)/m4/canonicalize.m4 \ + $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/acl.m4 \ + $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argp.m4 \ + $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \ + $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/chown.m4 \ $(top_srcdir)/m4/clock_time.m4 \ $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ @@ -87,9 +115,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup.m4 \ $(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/eealloc.m4 \ $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/errno_h.m4 \ - $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exponentd.m4 \ - $(top_srcdir)/m4/extensions.m4 \ - $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fchdir.m4 \ + $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/euidaccess.m4 \ + $(top_srcdir)/m4/exponentd.m4 $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/extern-inline.m4 \ + $(top_srcdir)/m4/faccessat.m4 $(top_srcdir)/m4/fchdir.m4 \ $(top_srcdir)/m4/fchmodat.m4 $(top_srcdir)/m4/fchownat.m4 \ $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl.m4 \ $(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fdopendir.m4 \ @@ -101,19 +130,21 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/m4/getcwd-path-max.m4 $(top_srcdir)/m4/getcwd.m4 \ $(top_srcdir)/m4/getdelim.m4 $(top_srcdir)/m4/getdtablesize.m4 \ - $(top_srcdir)/m4/getline.m4 $(top_srcdir)/m4/getopt.m4 \ - $(top_srcdir)/m4/getpagesize.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gettime.m4 $(top_srcdir)/m4/gettimeofday.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/human.m4 \ + $(top_srcdir)/m4/getgroups.m4 $(top_srcdir)/m4/getline.m4 \ + $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/getpagesize.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettime.m4 \ + $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ + $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 \ + $(top_srcdir)/m4/group-member.m4 $(top_srcdir)/m4/human.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/include_next.m4 \ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \ $(top_srcdir)/m4/inttostr.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ - $(top_srcdir)/m4/iswblank.m4 $(top_srcdir)/m4/langinfo_h.m4 \ - $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lchown.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/isatty.m4 $(top_srcdir)/m4/iswblank.m4 \ + $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ + $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ $(top_srcdir)/m4/link-follow.m4 $(top_srcdir)/m4/link.m4 \ $(top_srcdir)/m4/linkat.m4 $(top_srcdir)/m4/localcharset.m4 \ @@ -139,19 +170,21 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/paxutils.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf.m4 \ - $(top_srcdir)/m4/priv-set.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ - $(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \ - $(top_srcdir)/m4/read.m4 $(top_srcdir)/m4/readdir.m4 \ - $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/readlinkat.m4 \ - $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.m4 \ - $(top_srcdir)/m4/rename.m4 $(top_srcdir)/m4/renameat.m4 \ - $(top_srcdir)/m4/rewinddir.m4 $(top_srcdir)/m4/rmdir.m4 \ - $(top_srcdir)/m4/rmt.m4 $(top_srcdir)/m4/rpmatch.m4 \ - $(top_srcdir)/m4/rtapelib.m4 $(top_srcdir)/m4/safe-read.m4 \ - $(top_srcdir)/m4/safe-write.m4 $(top_srcdir)/m4/save-cwd.m4 \ - $(top_srcdir)/m4/savedir.m4 $(top_srcdir)/m4/secure_getenv.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix_openpt.m4 \ + $(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/priv-set.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/ptsname.m4 \ + $(top_srcdir)/m4/ptsname_r.m4 $(top_srcdir)/m4/quote.m4 \ + $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/raise.m4 \ + $(top_srcdir)/m4/rawmemchr.m4 $(top_srcdir)/m4/read.m4 \ + $(top_srcdir)/m4/readdir.m4 $(top_srcdir)/m4/readlink.m4 \ + $(top_srcdir)/m4/readlinkat.m4 $(top_srcdir)/m4/realloc.m4 \ + $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rename.m4 \ + $(top_srcdir)/m4/renameat.m4 $(top_srcdir)/m4/rewinddir.m4 \ + $(top_srcdir)/m4/rmdir.m4 $(top_srcdir)/m4/rmt.m4 \ + $(top_srcdir)/m4/rpmatch.m4 $(top_srcdir)/m4/rtapelib.m4 \ + $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/safe-write.m4 \ + $(top_srcdir)/m4/save-cwd.m4 $(top_srcdir)/m4/savedir.m4 \ + $(top_srcdir)/m4/secure_getenv.m4 \ $(top_srcdir)/m4/selinux-context-h.m4 \ $(top_srcdir)/m4/selinux-selinux-h.m4 \ $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/signal_h.m4 \ @@ -164,20 +197,23 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \ $(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \ - $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strings_h.m4 $(top_srcdir)/m4/strndup.m4 \ - $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strtol.m4 \ - $(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \ - $(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/symlink.m4 \ - $(top_srcdir)/m4/symlinkat.m4 $(top_srcdir)/m4/sys_socket_h.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strftime.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \ + $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ + $(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \ + $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \ + $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \ + $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/symlinkat.m4 \ + $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sysexits.m4 \ $(top_srcdir)/m4/system.m4 $(top_srcdir)/m4/tempname.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ - $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \ - $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkat.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \ + $(top_srcdir)/m4/ttyname_r.m4 $(top_srcdir)/m4/unistd-safer.m4 \ + $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ + $(top_srcdir)/m4/unlinkat.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/unlockpt.m4 \ $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utimens.m4 \ $(top_srcdir)/m4/utimensat.m4 $(top_srcdir)/m4/utimes.m4 \ $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ @@ -245,6 +281,7 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) pkglibexecdir = @pkglibexecdir@ ACLOCAL = @ACLOCAL@ @@ -813,6 +850,7 @@ LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@ LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ LIB_ACL = @LIB_ACL@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_EACCESS = @LIB_EACCESS@ LIB_SELINUX = @LIB_SELINUX@ LIB_SETSOCKOPT = @LIB_SETSOCKOPT@ LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ @@ -928,11 +966,13 @@ REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ +REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ +REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ @@ -941,6 +981,7 @@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ REPLACE_LOCALECONV = @REPLACE_LOCALECONV@ +REPLACE_LOCALTIME = @REPLACE_LOCALTIME@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ REPLACE_LSTAT = @REPLACE_LSTAT@ @@ -1007,6 +1048,7 @@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOD = @REPLACE_STRTOD@ REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ +REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ @@ -1034,6 +1076,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ RSH = @RSH@ +SED = @SED@ SELINUX_CONTEXT_H = @SELINUX_CONTEXT_H@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -1071,6 +1114,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -1115,6 +1159,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1277,11 +1322,9 @@ installcheck-sbinSCRIPTS: $(sbin_SCRIPTS) else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ done; \ done; rm -f c$${pid}_.???; exit $$bad -tags: TAGS -TAGS: +tags TAGS: -ctags: CTAGS -CTAGS: +ctags CTAGS: cscope cscopelist: @@ -1422,18 +1465,19 @@ uninstall-am: uninstall-libexecSCRIPTS uninstall-sbinSCRIPTS .MAKE: install-am install-strip -.PHONY: all all-am check check-am clean clean-generic distclean \ - distclean-generic distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-libexecSCRIPTS install-man install-pdf install-pdf-am \ - install-ps install-ps-am install-sbinSCRIPTS install-strip \ - installcheck installcheck-am installcheck-libexecSCRIPTS \ - installcheck-sbinSCRIPTS installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am uninstall uninstall-am \ - uninstall-libexecSCRIPTS uninstall-sbinSCRIPTS +.PHONY: all all-am check check-am clean clean-generic cscopelist-am \ + ctags-am distclean distclean-generic distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecSCRIPTS install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-sbinSCRIPTS \ + install-strip installcheck installcheck-am \ + installcheck-libexecSCRIPTS installcheck-sbinSCRIPTS \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags-am \ + uninstall uninstall-am uninstall-libexecSCRIPTS \ + uninstall-sbinSCRIPTS backup.sh: $(srcdir)/backup.sh.in diff --git a/scripts/backup-specs b/scripts/backup-specs index fb252aa..f06233b 100644 --- a/scripts/backup-specs +++ b/scripts/backup-specs @@ -82,7 +82,7 @@ SLEEP_MESSAGE="`awk ' }' /dev/null`" -# Copyright 2004, 2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/scripts/backup.sh.in b/scripts/backup.sh.in index e0d1c68..9977ec2 100644 --- a/scripts/backup.sh.in +++ b/scripts/backup.sh.in @@ -1,7 +1,7 @@ #! /bin/sh # Make backups. -# Copyright 2004-2006, 2013 Free Software Foundation, Inc. +# Copyright 2004-2006, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/scripts/dump-remind.in b/scripts/dump-remind.in index 415026e..f9a299b 100644 --- a/scripts/dump-remind.in +++ b/scripts/dump-remind.in @@ -8,7 +8,7 @@ # interested parties that a tape for the next volume of the backup needs to # be put in the tape drive. -# Copyright 2004-2005, 2010, 2012-2013 Free Software Foundation, Inc. +# Copyright 2004-2005, 2010, 2012-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/scripts/restore.in b/scripts/restore.in index 5014ead..f4e80e8 100644 --- a/scripts/restore.in +++ b/scripts/restore.in @@ -1,7 +1,7 @@ #! /bin/sh # Restore backups. -# Copyright 2004, 2006, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/src/Makefile.am b/src/Makefile.am index 07c117d..82b2d46 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ # Makefile for GNU tar sources. -# Copyright 1994-1997, 1999-2001, 2003, 2006-2007, 2009, 2013 Free +# Copyright 1994-1997, 1999-2001, 2003, 2006-2007, 2009, 2013-2014 Free # Software Foundation, Inc. # This file is part of GNU tar. @@ -28,6 +28,7 @@ tar_SOURCES = \ create.c\ delete.c\ exit.c\ + exclist.c\ extract.c\ xheader.c\ incremen.c\ @@ -51,3 +52,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) LDADD = ../lib/libtar.a ../gnu/libgnu.a $(LIBINTL) $(LIBICONV) tar_LDADD = $(LIBS) $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS) $(LIB_SELINUX) + +if TAR_LIB_ATTR +tar_LDADD += -lattr +endif diff --git a/src/Makefile.in b/src/Makefile.in index eb3d8fb..6f9a592 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.6 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,7 @@ # Makefile for GNU tar sources. -# Copyright 1994-1997, 1999-2001, 2003, 2006-2007, 2009, 2013 Free +# Copyright 1994-1997, 1999-2001, 2003, 2006-2007, 2009, 2013-2014 Free # Software Foundation, Inc. # This file is part of GNU tar. @@ -36,23 +36,51 @@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -71,15 +99,16 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ bin_PROGRAMS = tar$(EXEEXT) +@TAR_LIB_ATTR_TRUE@am__append_1 = -lattr subdir = src -DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/build-aux/depcomp +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/build-aux/depcomp $(noinst_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ - $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/alloca.m4 \ - $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/backupfile.m4 \ - $(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/btowc.m4 \ - $(top_srcdir)/m4/canonicalize.m4 \ + $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/acl.m4 \ + $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argp.m4 \ + $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \ + $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/chown.m4 \ $(top_srcdir)/m4/clock_time.m4 \ $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ @@ -91,9 +120,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup.m4 \ $(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/eealloc.m4 \ $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/errno_h.m4 \ - $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exponentd.m4 \ - $(top_srcdir)/m4/extensions.m4 \ - $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fchdir.m4 \ + $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/euidaccess.m4 \ + $(top_srcdir)/m4/exponentd.m4 $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/extern-inline.m4 \ + $(top_srcdir)/m4/faccessat.m4 $(top_srcdir)/m4/fchdir.m4 \ $(top_srcdir)/m4/fchmodat.m4 $(top_srcdir)/m4/fchownat.m4 \ $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl.m4 \ $(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fdopendir.m4 \ @@ -105,19 +135,21 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/m4/getcwd-path-max.m4 $(top_srcdir)/m4/getcwd.m4 \ $(top_srcdir)/m4/getdelim.m4 $(top_srcdir)/m4/getdtablesize.m4 \ - $(top_srcdir)/m4/getline.m4 $(top_srcdir)/m4/getopt.m4 \ - $(top_srcdir)/m4/getpagesize.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gettime.m4 $(top_srcdir)/m4/gettimeofday.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/human.m4 \ + $(top_srcdir)/m4/getgroups.m4 $(top_srcdir)/m4/getline.m4 \ + $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/getpagesize.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettime.m4 \ + $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ + $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 \ + $(top_srcdir)/m4/group-member.m4 $(top_srcdir)/m4/human.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/include_next.m4 \ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \ $(top_srcdir)/m4/inttostr.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ - $(top_srcdir)/m4/iswblank.m4 $(top_srcdir)/m4/langinfo_h.m4 \ - $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lchown.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/isatty.m4 $(top_srcdir)/m4/iswblank.m4 \ + $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ + $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ $(top_srcdir)/m4/link-follow.m4 $(top_srcdir)/m4/link.m4 \ $(top_srcdir)/m4/linkat.m4 $(top_srcdir)/m4/localcharset.m4 \ @@ -143,19 +175,21 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/paxutils.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf.m4 \ - $(top_srcdir)/m4/priv-set.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ - $(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \ - $(top_srcdir)/m4/read.m4 $(top_srcdir)/m4/readdir.m4 \ - $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/readlinkat.m4 \ - $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.m4 \ - $(top_srcdir)/m4/rename.m4 $(top_srcdir)/m4/renameat.m4 \ - $(top_srcdir)/m4/rewinddir.m4 $(top_srcdir)/m4/rmdir.m4 \ - $(top_srcdir)/m4/rmt.m4 $(top_srcdir)/m4/rpmatch.m4 \ - $(top_srcdir)/m4/rtapelib.m4 $(top_srcdir)/m4/safe-read.m4 \ - $(top_srcdir)/m4/safe-write.m4 $(top_srcdir)/m4/save-cwd.m4 \ - $(top_srcdir)/m4/savedir.m4 $(top_srcdir)/m4/secure_getenv.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix_openpt.m4 \ + $(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/priv-set.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/ptsname.m4 \ + $(top_srcdir)/m4/ptsname_r.m4 $(top_srcdir)/m4/quote.m4 \ + $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/raise.m4 \ + $(top_srcdir)/m4/rawmemchr.m4 $(top_srcdir)/m4/read.m4 \ + $(top_srcdir)/m4/readdir.m4 $(top_srcdir)/m4/readlink.m4 \ + $(top_srcdir)/m4/readlinkat.m4 $(top_srcdir)/m4/realloc.m4 \ + $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rename.m4 \ + $(top_srcdir)/m4/renameat.m4 $(top_srcdir)/m4/rewinddir.m4 \ + $(top_srcdir)/m4/rmdir.m4 $(top_srcdir)/m4/rmt.m4 \ + $(top_srcdir)/m4/rpmatch.m4 $(top_srcdir)/m4/rtapelib.m4 \ + $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/safe-write.m4 \ + $(top_srcdir)/m4/save-cwd.m4 $(top_srcdir)/m4/savedir.m4 \ + $(top_srcdir)/m4/secure_getenv.m4 \ $(top_srcdir)/m4/selinux-context-h.m4 \ $(top_srcdir)/m4/selinux-selinux-h.m4 \ $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/signal_h.m4 \ @@ -168,20 +202,23 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \ $(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \ - $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strings_h.m4 $(top_srcdir)/m4/strndup.m4 \ - $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strtol.m4 \ - $(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \ - $(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/symlink.m4 \ - $(top_srcdir)/m4/symlinkat.m4 $(top_srcdir)/m4/sys_socket_h.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strftime.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \ + $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ + $(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \ + $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \ + $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \ + $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/symlinkat.m4 \ + $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sysexits.m4 \ $(top_srcdir)/m4/system.m4 $(top_srcdir)/m4/tempname.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ - $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \ - $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkat.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \ + $(top_srcdir)/m4/ttyname_r.m4 $(top_srcdir)/m4/unistd-safer.m4 \ + $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ + $(top_srcdir)/m4/unlinkat.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/unlockpt.m4 \ $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utimens.m4 \ $(top_srcdir)/m4/utimensat.m4 $(top_srcdir)/m4/utimes.m4 \ $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ @@ -205,17 +242,18 @@ am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) am_tar_OBJECTS = buffer.$(OBJEXT) checkpoint.$(OBJEXT) \ compare.$(OBJEXT) create.$(OBJEXT) delete.$(OBJEXT) \ - exit.$(OBJEXT) extract.$(OBJEXT) xheader.$(OBJEXT) \ - incremen.$(OBJEXT) list.$(OBJEXT) misc.$(OBJEXT) \ - names.$(OBJEXT) sparse.$(OBJEXT) suffix.$(OBJEXT) \ - system.$(OBJEXT) tar.$(OBJEXT) transform.$(OBJEXT) \ - unlink.$(OBJEXT) update.$(OBJEXT) utf8.$(OBJEXT) \ - warning.$(OBJEXT) xattrs.$(OBJEXT) + exit.$(OBJEXT) exclist.$(OBJEXT) extract.$(OBJEXT) \ + xheader.$(OBJEXT) incremen.$(OBJEXT) list.$(OBJEXT) \ + misc.$(OBJEXT) names.$(OBJEXT) sparse.$(OBJEXT) \ + suffix.$(OBJEXT) system.$(OBJEXT) tar.$(OBJEXT) \ + transform.$(OBJEXT) unlink.$(OBJEXT) update.$(OBJEXT) \ + utf8.$(OBJEXT) warning.$(OBJEXT) xattrs.$(OBJEXT) tar_OBJECTS = $(am_tar_OBJECTS) am__DEPENDENCIES_1 = am__DEPENDENCIES_2 = ../lib/libtar.a ../gnu/libgnu.a \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) tar_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) @@ -253,6 +291,23 @@ am__can_run_installinfo = \ *) (install-info --version) >/dev/null 2>&1;; \ esac HEADERS = $(noinst_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -823,6 +878,7 @@ LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@ LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ LIB_ACL = @LIB_ACL@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_EACCESS = @LIB_EACCESS@ LIB_SELINUX = @LIB_SELINUX@ LIB_SETSOCKOPT = @LIB_SETSOCKOPT@ LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ @@ -938,11 +994,13 @@ REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ +REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ +REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ @@ -951,6 +1009,7 @@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ REPLACE_LOCALECONV = @REPLACE_LOCALECONV@ +REPLACE_LOCALTIME = @REPLACE_LOCALTIME@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ REPLACE_LSTAT = @REPLACE_LSTAT@ @@ -1017,6 +1076,7 @@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOD = @REPLACE_STRTOD@ REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ +REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ @@ -1044,6 +1104,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ RSH = @RSH@ +SED = @SED@ SELINUX_CONTEXT_H = @SELINUX_CONTEXT_H@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -1081,6 +1142,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -1125,6 +1187,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1141,6 +1204,7 @@ tar_SOURCES = \ create.c\ delete.c\ exit.c\ + exclist.c\ extract.c\ xheader.c\ incremen.c\ @@ -1161,7 +1225,8 @@ tar_SOURCES = \ AM_CPPFLAGS = -I$(top_srcdir)/gnu -I../ -I../gnu -I$(top_srcdir)/lib -I../lib AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) LDADD = ../lib/libtar.a ../gnu/libgnu.a $(LIBINTL) $(LIBICONV) -tar_LDADD = $(LIBS) $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS) $(LIB_SELINUX) +tar_LDADD = $(LIBS) $(LDADD) $(LIB_CLOCK_GETTIME) $(LIB_EACCESS) \ + $(LIB_SELINUX) $(am__append_1) all: all-am .SUFFIXES: @@ -1205,10 +1270,11 @@ install-binPROGRAMS: $(bin_PROGRAMS) fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -1229,7 +1295,8 @@ uninstall-binPROGRAMS: @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -1252,6 +1319,7 @@ installcheck-binPROGRAMS: $(bin_PROGRAMS) else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \ done; \ done; rm -f c$${pid}_.???; exit $$bad + tar$(EXEEXT): $(tar_OBJECTS) $(tar_DEPENDENCIES) $(EXTRA_tar_DEPENDENCIES) @rm -f tar$(EXEEXT) $(AM_V_CCLD)$(LINK) $(tar_OBJECTS) $(tar_LDADD) $(LIBS) @@ -1267,6 +1335,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compare.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/create.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/delete.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exclist.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exit.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extract.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/incremen.Po@am__quote@ @@ -1290,35 +1359,24 @@ distclean-compile: @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1330,15 +1388,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1347,9 +1401,10 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -1503,18 +1558,19 @@ uninstall-am: uninstall-binPROGRAMS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic cscopelist ctags distclean distclean-compile \ - distclean-generic distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installcheck-binPROGRAMS \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ - ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic cscopelist-am ctags ctags-am \ + distclean distclean-compile distclean-generic distclean-tags \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-binPROGRAMS install-data install-data-am \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installcheck-binPROGRAMS installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-binPROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/src/arith.h b/src/arith.h index 1bc1547..0749d19 100644 --- a/src/arith.h +++ b/src/arith.h @@ -1,5 +1,5 @@ /* Long integers, for GNU tar. - Copyright 1999, 2007, 2013 Free Software Foundation, Inc. + Copyright 1999, 2007, 2013-2014 Free Software Foundation, Inc. This file is part of GNU tar. diff --git a/src/buffer.c b/src/buffer.c index 4b44eaf..a7d8971 100644 --- a/src/buffer.c +++ b/src/buffer.c @@ -1,7 +1,7 @@ /* Buffer management for tar. - Copyright 1988, 1992-1994, 1996-1997, 1999-2010, 2013 Free Software - Foundation, Inc. + Copyright 1988, 1992-1994, 1996-1997, 1999-2010, 2013-2014 Free + Software Foundation, Inc. This file is part of GNU tar. @@ -247,7 +247,7 @@ set_volume_start_time (void) last_stat_time = volume_start_time; } -void +double compute_duration (void) { struct timespec now; @@ -255,6 +255,7 @@ compute_duration (void) duration += ((now.tv_sec - last_stat_time.tv_sec) + (now.tv_nsec - last_stat_time.tv_nsec) / 1e9); gettime (&last_stat_time); + return duration; } @@ -488,64 +489,98 @@ open_compressed_archive (void) return archive; } - -static void +static int print_stats (FILE *fp, const char *text, tarlong numbytes) { - char bytes[sizeof (tarlong) * CHAR_BIT]; char abbr[LONGEST_HUMAN_READABLE + 1]; char rate[LONGEST_HUMAN_READABLE + 1]; - + int n = 0; + int human_opts = human_autoscale | human_base_1024 | human_SI | human_B; - sprintf (bytes, TARLONG_FORMAT, numbytes); - - fprintf (fp, "%s: %s (%s, %s/s)\n", - text, bytes, - human_readable (numbytes, abbr, human_opts, 1, 1), - (0 < duration && numbytes / duration < (uintmax_t) -1 - ? human_readable (numbytes / duration, rate, human_opts, 1, 1) - : "?")); + if (text && text[0]) + n += fprintf (fp, "%s: ", gettext (text)); + return n + fprintf (fp, TARLONG_FORMAT " (%s, %s/s)", + numbytes, + human_readable (numbytes, abbr, human_opts, 1, 1), + (0 < duration && numbytes / duration < (uintmax_t) -1 + ? human_readable (numbytes / duration, rate, human_opts, 1, 1) + : "?")); } -void -print_total_stats (void) +/* Format totals to file FP. FORMATS is an array of strings to output + before each data item (bytes read, written, deleted, in that order). + EOR is a delimiter to output after each item (used only if deleting + from the archive), EOL is a delimiter to add at the end of the output + line. */ +int +format_total_stats (FILE *fp, const char **formats, int eor, int eol) { + int n; + switch (subcommand_option) { case CREATE_SUBCOMMAND: case CAT_SUBCOMMAND: case UPDATE_SUBCOMMAND: case APPEND_SUBCOMMAND: - /* Amanda 2.4.1p1 looks for "Total bytes written: [0-9][0-9]*". */ - print_stats (stderr, _("Total bytes written"), - prev_written + bytes_written); + n = print_stats (fp, formats[TF_WRITE], + prev_written + bytes_written); break; case DELETE_SUBCOMMAND: { char buf[UINTMAX_STRSIZE_BOUND]; - print_stats (stderr, _("Total bytes read"), - records_read * record_size); - print_stats (stderr, _("Total bytes written"), - prev_written + bytes_written); - fprintf (stderr, _("Total bytes deleted: %s\n"), - STRINGIFY_BIGINT ((records_read - records_skipped) - * record_size - - (prev_written + bytes_written), buf)); + n = print_stats (fp, formats[TF_READ], + records_read * record_size); + + fputc (eor, fp); + n++; + + n += print_stats (fp, formats[TF_WRITE], + prev_written + bytes_written); + + fputc (eor, fp); + n++; + + if (formats[TF_DELETED] && formats[TF_DELETED][0]) + n += fprintf (fp, "%s: ", gettext (formats[TF_DELETED])); + n += fprintf (fp, "%s", + STRINGIFY_BIGINT ((records_read - records_skipped) + * record_size + - (prev_written + bytes_written), buf)); } break; case EXTRACT_SUBCOMMAND: case LIST_SUBCOMMAND: case DIFF_SUBCOMMAND: - print_stats (stderr, _("Total bytes read"), - records_read * record_size); + n = print_stats (fp, _(formats[TF_READ]), + records_read * record_size); break; default: abort (); } + if (eol) + { + fputc (eol, fp); + n++; + } + return n; +} + +const char *default_total_format[] = { + N_("Total bytes read"), + /* Amanda 2.4.1p1 looks for "Total bytes written: [0-9][0-9]*". */ + N_("Total bytes written"), + N_("Total bytes deleted") +}; + +void +print_total_stats (void) +{ + format_total_stats (stderr, default_total_format, '\n', '\n'); } /* Compute and return the block ordinal at current_block. */ @@ -633,6 +668,22 @@ init_buffer (void) record_end = record_start + blocking_factor; } +static void +check_tty (enum access_mode mode) +{ + /* Refuse to read archive from and write it to a tty. */ + if (strcmp (archive_name_array[0], "-") == 0 + && isatty (mode == ACCESS_READ ? STDIN_FILENO : STDOUT_FILENO)) + { + FATAL_ERROR ((0, 0, + mode == ACCESS_READ + ? _("Refusing to read archive contents from terminal " + "(missing -f option?)") + : _("Refusing to write archive contents to terminal " + "(missing -f option?)"))); + } +} + /* Open an archive file. The argument specifies whether we are reading or writing, or both. */ static void @@ -653,6 +704,7 @@ _open_archive (enum access_mode wanted_access) /* When updating the archive, we start with reading. */ access_mode = wanted_access == ACCESS_UPDATE ? ACCESS_READ : wanted_access; + check_tty (access_mode); read_full_records = read_full_records_option; @@ -696,7 +748,6 @@ _open_archive (enum access_mode wanted_access) enum compress_type type; archive = STDIN_FILENO; - type = check_compressed_archive (&shortfile); if (type != ct_tar && type != ct_none) FATAL_ERROR ((0, 0, diff --git a/src/checkpoint.c b/src/checkpoint.c index 54c2cd6..54e7b59 100644 --- a/src/checkpoint.c +++ b/src/checkpoint.c @@ -1,6 +1,6 @@ /* Checkpoint management for tar. - Copyright 2007, 2013 Free Software Foundation, Inc. + Copyright 2007, 2013-2014 Free Software Foundation, Inc. This file is part of GNU tar. @@ -19,6 +19,10 @@ #include #include "common.h" +#include "wordsplit.h" +#include +#include +#include "fprintftime.h" enum checkpoint_opcode { @@ -27,7 +31,8 @@ enum checkpoint_opcode cop_echo, cop_ttyout, cop_sleep, - cop_exec + cop_exec, + cop_totals }; struct checkpoint_action @@ -110,6 +115,8 @@ checkpoint_compile_action (const char *str) act = alloc_action (cop_sleep); act->v.time = n; } + else if (strcmp (str, "totals") == 0) + alloc_action (cop_totals); else FATAL_ERROR ((0, 0, _("%s: unknown checkpoint action"), str)); } @@ -128,68 +135,211 @@ checkpoint_finish_compile (void) checkpoint_option = DEFAULT_CHECKPOINT; } +static const char *checkpoint_total_format[] = { + "R", + "W", + "D" +}; + +static long +getwidth (FILE *fp) +{ + char const *columns; + +#ifdef TIOCGWINSZ + struct winsize ws; + if (ioctl (fileno (fp), TIOCGWINSZ, &ws) == 0 && 0 < ws.ws_col) + return ws.ws_col; +#endif + + columns = getenv ("COLUMNS"); + if (columns) + { + long int col = strtol (columns, NULL, 10); + if (0 < col) + return col; + } + + return 80; +} + static char * -expand_checkpoint_string (const char *input, bool do_write, unsigned cpn) +getarg (const char *input, const char ** endp, char **argbuf, size_t *arglen) +{ + if (input[0] == '{') + { + char *p = strchr (input + 1, '}'); + if (p) + { + size_t n = p - input; + if (n > *arglen) + { + *arglen = n; + *argbuf = xrealloc (*argbuf, *arglen); + } + n--; + memcpy (*argbuf, input + 1, n); + (*argbuf)[n] = 0; + *endp = p + 1; + return *argbuf; + } + } + + *endp = input; + return NULL; +} + +static int tty_cleanup; + +static const char *def_format = + "%{%Y-%m-%d %H:%M:%S}t: %ds, %{read,wrote}T%*\r"; + +static int +format_checkpoint_string (FILE *fp, size_t len, + const char *input, bool do_write, + unsigned cpn) { const char *opstr = do_write ? gettext ("write") : gettext ("read"); - size_t opstrlen = strlen (opstr); char uintbuf[UINTMAX_STRSIZE_BOUND]; char *cps = STRINGIFY_BIGINT (cpn, uintbuf); - size_t cpslen = strlen (cps); const char *ip; - char *op; - char *output; - size_t outlen = strlen (input); /* Initial guess */ - /* Fix the initial length guess */ - for (ip = input; (ip = strchr (ip, '%')) != NULL; ) - { - switch (ip[1]) - { - case 'u': - outlen += cpslen - 2; - break; + static char *argbuf = NULL; + static size_t arglen = 0; + char *arg = NULL; - case 's': - outlen += opstrlen - 2; - } - ip++; + if (!input) + { + if (do_write) + /* TRANSLATORS: This is a "checkpoint of write operation", + *not* "Writing a checkpoint". + E.g. in Spanish "Punto de comprobaci@'on de escritura", + *not* "Escribiendo un punto de comprobaci@'on" */ + input = gettext ("Write checkpoint %u"); + else + /* TRANSLATORS: This is a "checkpoint of read operation", + *not* "Reading a checkpoint". + E.g. in Spanish "Punto de comprobaci@'on de lectura", + *not* "Leyendo un punto de comprobaci@'on" */ + input = gettext ("Read checkpoint %u"); } - output = xmalloc (outlen + 1); - for (ip = input, op = output; *ip; ) + for (ip = input; *ip; ip++) { if (*ip == '%') { - switch (*++ip) + if (*++ip == '{') { + arg = getarg (ip, &ip, &argbuf, &arglen); + if (!arg) + { + fputc ('%', fp); + fputc (*ip, fp); + len += 2; + continue; + } + } + switch (*ip) + { + case 'c': + len += format_checkpoint_string (fp, len, def_format, do_write, + cpn); + break; + case 'u': - op = stpcpy (op, cps); + fputs (cps, fp); + len += strlen (cps); break; case 's': - op = stpcpy (op, opstr); + fputs (opstr, fp); + len += strlen (opstr); + break; + + case 'd': + len += fprintf (fp, "%.0f", compute_duration ()); + break; + + case 'T': + { + const char **fmt = checkpoint_total_format, *fmtbuf[3]; + struct wordsplit ws; + compute_duration (); + + if (arg) + { + ws.ws_delim = ","; + if (wordsplit (arg, &ws, WRDSF_NOVAR | WRDSF_NOCMD | + WRDSF_QUOTE | WRDSF_DELIM)) + ERROR ((0, 0, _("cannot split string '%s': %s"), + arg, wordsplit_strerror (&ws))); + else + { + int i; + + for (i = 0; i < ws.ws_wordc; i++) + fmtbuf[i] = ws.ws_wordv[i]; + for (; i < 3; i++) + fmtbuf[i] = NULL; + fmt = fmtbuf; + } + } + len += format_total_stats (fp, fmt, ',', 0); + if (arg) + wordsplit_free (&ws); + } + break; + + case 't': + { + struct timeval tv; + struct tm *tm; + const char *fmt = arg ? arg : "%c"; + + gettimeofday (&tv, NULL); + tm = localtime (&tv.tv_sec); + len += fprintftime (fp, fmt, tm, 0, tv.tv_usec * 1000); + } + break; + + case '*': + { + long w = arg ? strtol (arg, NULL, 10) : getwidth (fp); + for (; w > len; len++) + fputc (' ', fp); + } break; default: - *op++ = '%'; - *op++ = *ip; + fputc ('%', fp); + fputc (*ip, fp); + len += 2; break; } - ip++; + arg = NULL; } else - *op++ = *ip++; + { + fputc (*ip, fp); + if (*ip == '\r') + { + len = 0; + tty_cleanup = 1; + } + else + len++; + } } - *op = 0; - return output; + fflush (fp); + return len; } +static FILE *tty = NULL; + static void run_checkpoint_actions (bool do_write) { struct checkpoint_action *p; - FILE *tty = NULL; for (p = checkpoint_action; p; p = p->next) { @@ -212,26 +362,10 @@ run_checkpoint_actions (bool do_write) case cop_echo: { - char *tmp; - const char *str = p->v.command; - if (!str) - { - if (do_write) - /* TRANSLATORS: This is a "checkpoint of write operation", - *not* "Writing a checkpoint". - E.g. in Spanish "Punto de comprobaci@'on de escritura", - *not* "Escribiendo un punto de comprobaci@'on" */ - str = gettext ("Write checkpoint %u"); - else - /* TRANSLATORS: This is a "checkpoint of read operation", - *not* "Reading a checkpoint". - E.g. in Spanish "Punto de comprobaci@'on de lectura", - *not* "Leyendo un punto de comprobaci@'on" */ - str = gettext ("Read checkpoint %u"); - } - tmp = expand_checkpoint_string (str, do_write, checkpoint); - WARN ((0, 0, "%s", tmp)); - free (tmp); + int n = fprintf (stderr, "%s: ", program_name); + format_checkpoint_string (stderr, n, p->v.command, do_write, + checkpoint); + fputc ('\n', stderr); } break; @@ -239,13 +373,8 @@ run_checkpoint_actions (bool do_write) if (!tty) tty = fopen ("/dev/tty", "w"); if (tty) - { - char *tmp = expand_checkpoint_string (p->v.command, do_write, - checkpoint); - fprintf (tty, "%s", tmp); - fflush (tty); - free (tmp); - } + format_checkpoint_string (tty, 0, p->v.command, do_write, + checkpoint); break; case cop_sleep: @@ -257,10 +386,37 @@ run_checkpoint_actions (bool do_write) archive_name_cursor[0], checkpoint); break; + + case cop_totals: + compute_duration (); + print_total_stats (); + } + } +} + +void +checkpoint_flush_actions (void) +{ + struct checkpoint_action *p; + + for (p = checkpoint_action; p; p = p->next) + { + switch (p->opcode) + { + case cop_ttyout: + if (tty && tty_cleanup) + { + long w = getwidth (tty); + while (w--) + fputc (' ', tty); + fputc ('\r', tty); + fflush (tty); + } + break; + default: + /* nothing */; } } - if (tty) - fclose (tty); } void @@ -269,3 +425,14 @@ checkpoint_run (bool do_write) if (checkpoint_option && !(++checkpoint % checkpoint_option)) run_checkpoint_actions (do_write); } + +void +checkpoint_finish (void) +{ + if (checkpoint_option) + { + checkpoint_flush_actions (); + if (tty) + fclose (tty); + } +} diff --git a/src/common.h b/src/common.h index eb801bb..edf787c 100644 --- a/src/common.h +++ b/src/common.h @@ -1,6 +1,6 @@ /* Common declarations for the tar program. - Copyright 1988, 1992-1994, 1996-1997, 1999-2010, 2012-2013 Free + Copyright 1988, 1992-1994, 1996-1997, 1999-2010, 2012-2014 Free Software Foundation, Inc. This file is part of GNU tar. @@ -235,6 +235,10 @@ GLOBAL bool numeric_owner_option; GLOBAL bool one_file_system_option; +/* Create a top-level directory for extracting based on the archive name. */ +GLOBAL bool one_top_level_option; +GLOBAL char *one_top_level_dir; + /* Specified value to be put into tar file in place of stat () results, or just null and -1 if such an override should not take place. */ GLOBAL char const *owner_name_option; @@ -382,6 +386,8 @@ GLOBAL dev_t root_device; /* Unquote filenames */ GLOBAL bool unquote_option; +GLOBAL int savedir_sort_order; + /* Show file or archive names after transformation. In particular, when creating archive in verbose mode, list member names as stored in the archive */ @@ -427,7 +433,7 @@ size_t available_space_after (union block *pointer); off_t current_block_ordinal (void); void close_archive (void); void closeout_volume_number (void); -void compute_duration (void); +double compute_duration (void); union block *find_next_block (void); void flush_read (void); void flush_write (void); @@ -444,6 +450,12 @@ void archive_read_error (void); off_t seek_archive (off_t size); void set_start_time (void); +#define TF_READ 0 +#define TF_WRITE 1 +#define TF_DELETED 2 +int format_total_stats (FILE *fp, const char **formats, int eor, int eol); +void print_total_stats (void); + void mv_begin_write (const char *file_name, off_t totsize, off_t sizeleft); void mv_begin_read (struct tar_stat_info *st); @@ -609,7 +621,6 @@ char *namebuf_name (namebuf_t buf, const char *name); void namebuf_add_dir (namebuf_t buf, const char *name); char *namebuf_finish (namebuf_t buf); -const char *tar_getcdpath (int); const char *tar_dirname (void); /* Represent N using a signed integer I such that (uintmax_t) I == N. @@ -732,8 +743,6 @@ char *new_name (const char *dir_name, const char *name); size_t stripped_prefix_len (char const *file_name, size_t num); bool all_names_found (struct tar_stat_info *st); -bool excluded_name (char const *name); - void add_avoided_name (char const *name); bool is_avoided_name (char const *name); @@ -851,11 +860,14 @@ bool transform_program_p (void); /* Module suffix.c */ void set_compression_program_by_suffix (const char *name, const char *defprog); +char *strip_compression_suffix (const char *name); /* Module checkpoint.c */ void checkpoint_compile_action (const char *str); void checkpoint_finish_compile (void); void checkpoint_run (bool do_write); +void checkpoint_finish (void); +void checkpoint_flush_actions (void); /* Module warning.c */ #define WARN_ALONE_ZERO_BLOCK 0x00000001 @@ -907,4 +919,16 @@ void finish_deferred_unlinks (void); /* Module exit.c */ extern void (*fatal_exit_hook) (void); +/* Module exclist.c */ +#define EXCL_DEFAULT 0x00 +#define EXCL_RECURSIVE 0x01 +#define EXCL_NON_RECURSIVE 0x02 + +void excfile_add (const char *name, int flags); +void info_attach_exclist (struct tar_stat_info *dir); +void info_cleanup_exclist (struct tar_stat_info *dir); +void info_free_exclist (struct tar_stat_info *dir); +bool excluded_name (char const *name, struct tar_stat_info *st); +void exclude_vcs_ignores (void); + _GL_INLINE_HEADER_END diff --git a/src/compare.c b/src/compare.c index 407fd40..d29cfdd 100644 --- a/src/compare.c +++ b/src/compare.c @@ -1,7 +1,7 @@ /* Diff files from a tar archive. Copyright 1988, 1992-1994, 1996-1997, 1999-2001, 2003-2007, - 2009-2010, 2012-2013 Free Software Foundation, Inc. + 2009-2010, 2012-2014 Free Software Foundation, Inc. This file is part of GNU tar. @@ -371,7 +371,10 @@ diff_dumpdir (struct tar_stat_info *dir) if (fd < 0) diag = open_diag; else if (fstat (fd, &dir->stat)) - diag = stat_diag; + { + diag = stat_diag; + close (fd); + } else dir->fd = fd; if (diag) @@ -439,10 +442,9 @@ diff_multivol (void) { seek_error_details (current_stat_info.file_name, offset); report_difference (¤t_stat_info, NULL); - return; } - - read_and_process (¤t_stat_info, process_rawdata); + else + read_and_process (¤t_stat_info, process_rawdata); status = close (fd); if (status != 0) diff --git a/src/create.c b/src/create.c index e14e13d..e2f4ede 100644 --- a/src/create.c +++ b/src/create.c @@ -1,7 +1,7 @@ /* Create a tar archive. Copyright 1985, 1992-1994, 1996-1997, 1999-2001, 2003-2007, - 2009-2010, 2012-2013 Free Software Foundation, Inc. + 2009-2010, 2012-2014 Free Software Foundation, Inc. This file is part of GNU tar. @@ -543,7 +543,7 @@ write_gnu_long_link (struct tar_stat_info *st, const char *p, char type) union block *header; char *tmpname; - header = start_private_header ("././@LongLink", size, start_time.tv_sec); + header = start_private_header ("././@LongLink", size, 0); uid_to_uname (0, &tmpname); UNAME_TO_CHARS (tmpname, header->header.uname); free (tmpname); @@ -1113,6 +1113,8 @@ dump_dir0 (struct tar_stat_info *st, char const *directory) if (!blk) return; + info_attach_exclist (st); + if (incremental_option && archive_format != POSIX_FORMAT) blk->header.typeflag = GNUTYPE_DUMPDIR; else /* if (standard_option) */ @@ -1196,7 +1198,7 @@ dump_dir0 (struct tar_stat_info *st, char const *directory) char const *entry; size_t entry_len; size_t name_len; - + name_buf = xstrdup (st->orig_file_name); name_size = name_len = strlen (name_buf); @@ -1210,7 +1212,7 @@ dump_dir0 (struct tar_stat_info *st, char const *directory) name_buf = xrealloc (name_buf, name_size + 1); } strcpy (name_buf + name_len, entry); - if (!excluded_name (name_buf)) + if (!excluded_name (name_buf, st)) dump_file (st, entry, name_buf); } @@ -1288,7 +1290,7 @@ get_directory_entries (struct tar_stat_info *st) while (! (st->dirstream = fdopendir (st->fd))) if (! open_failure_recover (st)) return 0; - return streamsavedir (st->dirstream); + return streamsavedir (st->dirstream, savedir_sort_order); } /* Dump the directory ST. Return true if successful, false (emitting @@ -1339,12 +1341,12 @@ create_archive (void) collect_and_sort_names (); while ((p = name_from_list ()) != NULL) - if (!excluded_name (p->name)) + if (!excluded_name (p->name, NULL)) dump_file (0, p->name, p->name); blank_name_list (); while ((p = name_from_list ()) != NULL) - if (!excluded_name (p->name)) + if (!excluded_name (p->name, NULL)) { struct tar_stat_info st; size_t plen = strlen (p->name); @@ -1358,7 +1360,7 @@ create_archive (void) if (! ISSLASH (buffer[plen - 1])) buffer[plen++] = DIRECTORY_SEPARATOR; tar_stat_init (&st); - q = directory_contents (gnu_list_name->directory); + q = directory_contents (p->directory); if (q) while (*q) { @@ -1401,7 +1403,7 @@ create_archive (void) { const char *name; while ((name = name_next (1)) != NULL) - if (!excluded_name (name)) + if (!excluded_name (name, NULL)) dump_file (0, name, name); } diff --git a/src/delete.c b/src/delete.c index d17dd25..337b922 100644 --- a/src/delete.c +++ b/src/delete.c @@ -1,7 +1,7 @@ /* Delete entries from a tar archive. Copyright 1988, 1992, 1994, 1996-1997, 2000-2001, 2003-2006, 2010, - 2013 Free Software Foundation, Inc. + 2013-2014 Free Software Foundation, Inc. This file is part of GNU tar. diff --git a/src/exclist.c b/src/exclist.c new file mode 100644 index 0000000..7cccc74 --- /dev/null +++ b/src/exclist.c @@ -0,0 +1,361 @@ +/* Per-directory exclusion files for tar. + + Copyright 2014 Free Software Foundation, Inc. + + This file is part of GNU tar. + + GNU tar is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + GNU tar is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General 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 +#include +#include +#include "common.h" + +typedef void (*add_fn) (struct exclude *, char const *, int, void *); + +struct vcs_ignore_file +{ + char const *filename; + int flags; + add_fn addfn; + void *(*initfn) (void *); + void *data; +}; + +static struct vcs_ignore_file *get_vcs_ignore_file (const char *name); + +struct excfile +{ + struct excfile *next; + int flags; + char name[1]; +}; + +struct excfile *excfile_head, *excfile_tail; + +void +excfile_add (const char *name, int flags) +{ + struct excfile *p = xmalloc (sizeof (*p) + strlen (name)); + p->next = NULL; + p->flags = flags; + strcpy (p->name, name); + if (excfile_tail) + excfile_tail->next = p; + else + excfile_head = p; + excfile_tail = p; +} + +struct exclist +{ + struct exclist *next, *prev; + int flags; + struct exclude *excluded; +}; + +void +info_attach_exclist (struct tar_stat_info *dir) +{ + struct excfile *file; + struct exclist *head = NULL, *tail = NULL, *ent; + struct vcs_ignore_file *vcsfile; + + if (dir->exclude_list) + return; + for (file = excfile_head; file; file = file->next) + { + if (faccessat (dir ? dir->fd : chdir_fd, file->name, F_OK, 0) == 0) + { + FILE *fp; + struct exclude *ex = NULL; + int fd = subfile_open (dir, file->name, O_RDONLY); + if (fd == -1) + { + open_error (file->name); + continue; + } + fp = fdopen (fd, "r"); + if (!fp) + { + ERROR ((0, errno, _("%s: fdopen failed"), file->name)); + close (fd); + continue; + } + + if (!ex) + ex = new_exclude (); + + vcsfile = get_vcs_ignore_file (file->name); + + if (vcsfile->initfn) + vcsfile->data = vcsfile->initfn (vcsfile->data); + + if (add_exclude_fp (vcsfile->addfn, ex, fp, + EXCLUDE_WILDCARDS|EXCLUDE_ANCHORED, '\n', + vcsfile->data)) + { + int e = errno; + FATAL_ERROR ((0, e, "%s", quotearg_colon (file->name))); + } + fclose (fp); + + ent = xmalloc (sizeof (*ent)); + ent->excluded = ex; + ent->flags = file->flags == EXCL_DEFAULT + ? file->flags : vcsfile->flags; + ent->prev = tail; + ent->next = NULL; + + if (tail) + tail->next = ent; + else + head = ent; + tail = ent; + } + } + dir->exclude_list = head; +} + +void +info_cleanup_exclist (struct tar_stat_info *dir) +{ + struct exclist *ep = dir->exclude_list; + + while (ep) + { + struct exclist *next = ep->next; + + if (ep->flags & EXCL_NON_RECURSIVE) + { + + /* Remove the entry */ + if (ep->prev) + ep->prev->next = ep->next; + else + dir->exclude_list = ep->next; + + if (ep->next) + ep->next->prev = ep->prev; + + free_exclude (ep->excluded); + free (ep); + } + ep = next; + } +} + +void +info_free_exclist (struct tar_stat_info *dir) +{ + struct exclist *ep = dir->exclude_list; + + while (ep) + { + struct exclist *next = ep->next; + free_exclude (ep->excluded); + free (ep); + ep = next; + } + + dir->exclude_list = NULL; +} + + +/* Return nonzero if file NAME is excluded. */ +bool +excluded_name (char const *name, struct tar_stat_info *st) +{ + struct exclist *ep; + const char *rname = NULL; + char *bname = NULL; + bool result; + int nr = 0; + + name += FILE_SYSTEM_PREFIX_LEN (name); + + /* Try global exclusion list first */ + if (excluded_file_name (excluded, name)) + return true; + + if (!st) + return false; + + for (result = false; st && !result; st = st->parent, nr = EXCL_NON_RECURSIVE) + { + for (ep = st->exclude_list; ep; ep = ep->next) + { + if (ep->flags & nr) + continue; + if ((result = excluded_file_name (ep->excluded, name))) + break; + + if (!rname) + { + rname = name; + /* Skip leading ./ */ + while (*rname == '.' && ISSLASH (rname[1])) + rname += 2; + } + if ((result = excluded_file_name (ep->excluded, rname))) + break; + + if (!bname) + bname = base_name (name); + if ((result = excluded_file_name (ep->excluded, bname))) + break; + } + } + + free (bname); + + return result; +} + +static void +cvs_addfn (struct exclude *ex, char const *pattern, int options, void *data) +{ + struct wordsplit ws; + size_t i; + + if (wordsplit (pattern, &ws, + WRDSF_NOVAR | WRDSF_NOCMD | WRDSF_SQUEEZE_DELIMS)) + return; + for (i = 0; i < ws.ws_wordc; i++) + add_exclude (ex, ws.ws_wordv[i], options); + wordsplit_free (&ws); +} + +static void +git_addfn (struct exclude *ex, char const *pattern, int options, void *data) +{ + while (isspace (*pattern)) + ++pattern; + if (*pattern == 0 || *pattern == '#') + return; + if (*pattern == '\\' && pattern[1] == '#') + ++pattern; + add_exclude (ex, pattern, options); +} + +static void +bzr_addfn (struct exclude *ex, char const *pattern, int options, void *data) +{ + while (isspace (*pattern)) + ++pattern; + if (*pattern == 0 || *pattern == '#') + return; + if (*pattern == '!') + { + if (*++pattern == '!') + ++pattern; + else + options |= EXCLUDE_INCLUDE; + } + /* FIXME: According to the docs, globbing patterns are rsync-style, + and regexps are perl-style. */ + if (strncmp (pattern, "RE:", 3) == 0) + { + pattern += 3; + options &= ~EXCLUDE_WILDCARDS; + options |= EXCLUDE_REGEX; + } + add_exclude (ex, pattern, options); +} + +static void * +hg_initfn (void *data) +{ + int *hgopt; + static int hg_options; + + if (!data) + hgopt = &hg_options; + + *hgopt = EXCLUDE_REGEX; + return hgopt; +} + +static void +hg_addfn (struct exclude *ex, char const *pattern, int options, void *data) +{ + int *hgopt = data; + size_t len; + + while (isspace (*pattern)) + ++pattern; + if (*pattern == 0 || *pattern == '#') + return; + if (strncmp (pattern, "syntax:", 7) == 0) + { + for (pattern += 7; isspace (*pattern); ++pattern) + ; + if (strcmp (pattern, "regexp") == 0) + /* FIXME: Regexps must be perl-style */ + *hgopt = EXCLUDE_REGEX; + else if (strcmp (pattern, "glob") == 0) + *hgopt = EXCLUDE_WILDCARDS; + /* Ignore unknown syntax */ + return; + } + + len = strlen(pattern); + if (pattern[len-1] == '/') + { + char *p; + + --len; + p = xmalloc (len+1); + memcpy (p, pattern, len); + p[len] = 0; + pattern = p; + exclude_add_pattern_buffer (ex, p); + options |= FNM_LEADING_DIR|EXCLUDE_ALLOC; + } + + add_exclude (ex, pattern, + ((*hgopt == EXCLUDE_REGEX) + ? (options & ~EXCLUDE_WILDCARDS) + : (options & ~EXCLUDE_REGEX)) | *hgopt); +} + +struct vcs_ignore_file vcs_ignore_files[] = { + { ".cvsignore", EXCL_NON_RECURSIVE, cvs_addfn, NULL, NULL }, + { ".gitignore", 0, git_addfn, NULL, NULL }, + { ".bzrignore", 0, bzr_addfn, NULL, NULL }, + { ".hgignore", 0, hg_addfn, hg_initfn , NULL }, + { NULL, 0, git_addfn, NULL, NULL } +}; + +static struct vcs_ignore_file * +get_vcs_ignore_file (const char *name) +{ + struct vcs_ignore_file *p; + + for (p = vcs_ignore_files; p->filename; p++) + if (strcmp (p->filename, name) == 0) + break; + + return p; +} + +void +exclude_vcs_ignores (void) +{ + struct vcs_ignore_file *p; + + for (p = vcs_ignore_files; p->filename; p++) + excfile_add (p->filename, EXCL_DEFAULT); +} diff --git a/src/exit.c b/src/exit.c index 74b13a4..411d630 100644 --- a/src/exit.c +++ b/src/exit.c @@ -1,6 +1,6 @@ /* Exit from GNU tar. - Copyright 2009, 2013 Free Software Foundation, Inc. + Copyright 2009, 2013-2014 Free Software Foundation, Inc. This file is part of GNU tar. diff --git a/src/extract.c b/src/extract.c index 9b6b7f9..ca25603 100644 --- a/src/extract.c +++ b/src/extract.c @@ -1,7 +1,7 @@ /* Extract files from a tar archive. - Copyright 1988, 1992-1994, 1996-2001, 2003-2007, 2010, 2012-2013 - Free Software Foundation, Inc. + Copyright 1988, 1992-1994, 1996-2001, 2003-2007, 2010, 2012-2014 Free + Software Foundation, Inc. This file is part of GNU tar. diff --git a/src/incremen.c b/src/incremen.c index f6b311e..b1b70ba 100644 --- a/src/incremen.c +++ b/src/incremen.c @@ -1,6 +1,6 @@ /* GNU dump extensions to tar. - Copyright 1988, 1992-1994, 1996-1997, 1999-2001, 2003-2009, 2013 + Copyright 1988, 1992-1994, 1996-1997, 1999-2001, 2003-2009, 2013-2014 Free Software Foundation, Inc. This file is part of GNU tar. @@ -734,6 +734,8 @@ scan_directory (struct tar_stat_info *st) if (! dirp) savedir_error (dir); + info_attach_exclist (st); + tmp = xstrdup (dir); zap_slashes (tmp); @@ -759,10 +761,10 @@ scan_directory (struct tar_stat_info *st) entry = dumpdir_next (itr)) { char *full_name = namebuf_name (nbuf, entry + 1); - + if (*entry == 'I') /* Ignored entry */ *entry = 'N'; - else if (excluded_name (full_name)) + else if (excluded_name (full_name, st)) *entry = 'N'; else { @@ -792,7 +794,7 @@ scan_directory (struct tar_stat_info *st) diag = stat_diag; } } - + if (diag) { file_removed_diag (full_name, false, diag); @@ -806,7 +808,7 @@ scan_directory (struct tar_stat_info *st) else if (directory->children == ALL_CHILDREN) pd_flag |= PD_FORCE_CHILDREN | ALL_CHILDREN; *entry = 'D'; - + stsub.parent = st; procdir (full_name, &stsub, pd_flag, entry); restore_parent_fd (&stsub); @@ -823,7 +825,7 @@ scan_directory (struct tar_stat_info *st) *entry = 'N'; else *entry = 'Y'; - + tar_stat_destroy (&stsub); } } @@ -832,7 +834,7 @@ scan_directory (struct tar_stat_info *st) else if (directory->tagfile) maketagdumpdir (directory); } - + namebuf_free (nbuf); free (dirp); @@ -1296,8 +1298,8 @@ void show_snapshot_field_ranges (void) { struct field_range const *p; - char minbuf[max (SYSINT_BUFSIZE, INT_BUFSIZE_BOUND (intmax_t))]; - char maxbuf[max (SYSINT_BUFSIZE, INT_BUFSIZE_BOUND (uintmax_t))]; + char minbuf[SYSINT_BUFSIZE]; + char maxbuf[SYSINT_BUFSIZE]; printf("This tar's snapshot file field ranges are\n"); printf (" (%-15s => [ %s, %s ]):\n\n", "field name", "min", "max"); @@ -1406,7 +1408,7 @@ write_directory_file_entry (void *entry, void *data) if (DIR_IS_FOUND (directory)) { - char buf[max (SYSINT_BUFSIZE, INT_BUFSIZE_BOUND (intmax_t))]; + char buf[SYSINT_BUFSIZE]; char const *s; s = DIR_IS_NFS (directory) ? "1" : "0"; diff --git a/src/list.c b/src/list.c index 858aa73..b4277e0 100644 --- a/src/list.c +++ b/src/list.c @@ -1,7 +1,7 @@ /* List a tar archive, with support routines for reading a tar archive. - Copyright 1988, 1992-1994, 1996-2001, 2003-2007, 2010, 2012-2013 - Free Software Foundation, Inc. + Copyright 1988, 1992-1994, 1996-2001, 2003-2007, 2010, 2012-2014 Free + Software Foundation, Inc. This file is part of GNU tar. @@ -115,6 +115,30 @@ transform_member_name (char **pinput, int type) return transform_name_fp (pinput, type, decode_xform, &type); } +static void +enforce_one_top_level (char **pfile_name) +{ + char *file_name = *pfile_name; + char *p; + + for (p = file_name; *p && (ISSLASH (*p) || *p == '.'); p++) + ; + + if (!*p) + return; + + if (strncmp (p, one_top_level_dir, strlen (one_top_level_dir)) == 0) + { + int pos = strlen (one_top_level_dir); + if (ISSLASH (p[pos]) || p[pos] == 0) + return; + } + + *pfile_name = new_name (one_top_level_dir, file_name); + normalize_filename_x (*pfile_name); + free (file_name); +} + void transform_stat_info (int typeflag, struct tar_stat_info *stat_info) { @@ -132,6 +156,9 @@ transform_stat_info (int typeflag, struct tar_stat_info *stat_info) case LNKTYPE: transform_member_name (&stat_info->link_name, XFORM_LINK); } + + if (one_top_level_option) + enforce_one_top_level (¤t_stat_info.file_name); } /* Main loop for reading an archive. */ @@ -176,7 +203,8 @@ read_and (void (*do_something) (void)) mtime.tv_nsec = 0, current_stat_info.mtime = mtime, OLDER_TAR_STAT_TIME (current_stat_info, m))) - || excluded_name (current_stat_info.file_name)) + || excluded_name (current_stat_info.file_name, + current_stat_info.parent)) { switch (current_header->header.typeflag) { @@ -194,6 +222,7 @@ read_and (void (*do_something) (void)) continue; } } + transform_stat_info (current_header->header.typeflag, ¤t_stat_info); (*do_something) (); @@ -723,7 +752,7 @@ from_header (char const *where0, size_t digs, char const *type, type)); return -1; } - if (!ISSPACE ((unsigned char) *where)) + if (!isspace ((unsigned char) *where)) break; where++; } @@ -861,7 +890,7 @@ from_header (char const *where0, size_t digs, char const *type, value = -value; } - if (where != lim && *where && !ISSPACE ((unsigned char) *where)) + if (where != lim && *where && !isspace ((unsigned char) *where)) { if (type) { @@ -1111,7 +1140,10 @@ simple_print_header (struct tar_stat_info *st, union block *blk, if (verbose_option <= 1) { /* Just the fax, mam. */ - fprintf (stdlis, "%s\n", quotearg (temp_name)); + fputs (quotearg (temp_name), stdlis); + if (show_transformed_names_option && st->had_trailing_slash) + fputc ('/', stdlis); + fputc ('\n', stdlis); } else { @@ -1138,9 +1170,7 @@ simple_print_header (struct tar_stat_info *st, union block *blk, case GNUTYPE_SPARSE: case REGTYPE: case AREGTYPE: - modes[0] = '-'; - if (temp_name[strlen (temp_name) - 1] == '/') - modes[0] = 'd'; + modes[0] = st->had_trailing_slash ? 'd' : '-'; break; case LNKTYPE: modes[0] = 'h'; @@ -1251,6 +1281,8 @@ simple_print_header (struct tar_stat_info *st, union block *blk, datewidth, time_stamp); fprintf (stdlis, " %s", quotearg (temp_name)); + if (show_transformed_names_option && st->had_trailing_slash) + fputc ('/', stdlis); switch (blk->header.typeflag) { diff --git a/src/misc.c b/src/misc.c index 0424ea7..8e66643 100644 --- a/src/misc.c +++ b/src/misc.c @@ -1,7 +1,7 @@ /* Miscellaneous functions, not really specific to GNU tar. Copyright 1988, 1992, 1994-1997, 1999-2001, 2003-2007, 2009-2010, - 2012-2013 Free Software Foundation, Inc. + 2012-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -29,6 +29,8 @@ # define DOUBLE_SLASH_IS_DISTINCT_ROOT 0 #endif +static const char *tar_getcdpath (int); + /* Handling strings. */ @@ -230,7 +232,7 @@ zap_slashes (char *name) /* Normalize FILE_NAME by removing redundant slashes and "." components, including redundant trailing slashes. - Leave ".." alone, as it may be significant in the presence + Leave ".." alone, as it may be significant in the presence of symlinks and on platforms where "/.." != "/". Destructive version: modifies its argument. */ @@ -286,11 +288,14 @@ normalize_filename (int cdidx, const char *name) this following approach may lead to situations where the same file or directory is processed twice under different absolute paths without that duplication being detected. Perhaps we - should use dev+ino pairs instead of names? */ + should use dev+ino pairs instead of names? (See listed03.at for + a related test case.) */ const char *cdpath = tar_getcdpath (cdidx); size_t copylen; bool need_separator; - + + if (!cdpath) + call_arg_fatal ("getcwd", "."); copylen = strlen (cdpath); need_separator = ! (DOUBLE_SLASH_IS_DISTINCT_ROOT && copylen == 2 && ISSLASH (cdpath[1])); @@ -834,10 +839,11 @@ struct wd { /* The directory's name. */ char const *name; - /* "absolute" path representing this directory; in the contrast to + /* "Absolute" path representing this directory; in the contrast to the real absolute pathname, it can contain /../ components (see - normalize_filename_x for the reason of it). */ - char *abspath; + normalize_filename_x for the reason of it). It is NULL if the + absolute path could not be determined. */ + char *abspath; /* If nonzero, the file descriptor of the directory, or AT_FDCWD if the working directory. If zero, the directory needs to be opened to be used. */ @@ -879,15 +885,13 @@ chdir_count (void) int chdir_arg (char const *dir) { + char *absdir; + if (wd_count == wd_alloc) { if (wd_alloc == 0) - { - wd_alloc = 2; - wd = xmalloc (sizeof *wd * wd_alloc); - } - else - wd = x2nrealloc (wd, &wd_alloc, sizeof *wd); + wd_alloc = 2; + wd = x2nrealloc (wd, &wd_alloc, sizeof *wd); if (! wd_count) { @@ -909,18 +913,22 @@ chdir_arg (char const *dir) return wd_count - 1; } - wd[wd_count].name = dir; - /* if the given name is an absolute path, then use that path - to represent this working directory; otherwise, construct - a path based on the previous -C option's absolute path */ - if (IS_ABSOLUTE_FILE_NAME (wd[wd_count].name)) - wd[wd_count].abspath = xstrdup (wd[wd_count].name); - else + + /* If the given name is absolute, use it to represent this directory; + otherwise, construct a name based on the previous -C option. */ + if (IS_ABSOLUTE_FILE_NAME (dir)) + absdir = xstrdup (dir); + else if (wd[wd_count - 1].abspath) { namebuf_t nbuf = namebuf_create (wd[wd_count - 1].abspath); - namebuf_add_dir (nbuf, wd[wd_count].name); - wd[wd_count].abspath = namebuf_finish (nbuf); + namebuf_add_dir (nbuf, dir); + absdir = namebuf_finish (nbuf); } + else + absdir = 0; + + wd[wd_count].name = dir; + wd[wd_count].abspath = absdir; wd[wd_count].fd = 0; return wd_count++; } @@ -1007,7 +1015,7 @@ tar_dirname (void) chdir_args() has never been called, so we simply return the process's actual cwd. (Note that in this case IDX is ignored, since it should always be 0.) */ -const char * +static const char * tar_getcdpath (int idx) { if (!wd) @@ -1206,7 +1214,7 @@ char * namebuf_finish (namebuf_t buf) { char *res = buf->buffer; - + if (ISSLASH (buf->buffer[buf->dir_length - 1])) buf->buffer[buf->dir_length] = 0; free (buf); @@ -1232,7 +1240,7 @@ tar_savedir (const char *name, int must_exist) open_error (name); } else if (! ((dir = fdopendir (fd)) - && (ret = streamsavedir (dir)))) + && (ret = streamsavedir (dir, savedir_sort_order)))) savedir_error (name); if (dir ? closedir (dir) != 0 : 0 <= fd && close (fd) != 0) diff --git a/src/names.c b/src/names.c index eecb9b0..594e7fd 100644 --- a/src/names.c +++ b/src/names.c @@ -1,7 +1,7 @@ /* Various processing of names. - Copyright 1988, 1992, 1994, 1996-2001, 2003-2007, 2009, 2013 Free - Software Foundation, Inc. + Copyright 1988, 1992, 1994, 1996-2001, 2003-2007, 2009, 2013-2014 + Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -439,7 +439,7 @@ handle_option (const char *str) int i; while (*str && isspace (*str)) - ; + ++str; if (*str != '-') return 1; @@ -492,6 +492,8 @@ read_next_name (struct name_elt *ent, struct name_elt *ret) ent->v.file.term = 0; /* fall through */ case file_list_success: + if (unquote_option) + unquote_string (name_buffer); if (handle_option (name_buffer) == 0) { name_list_adjust (); @@ -568,6 +570,7 @@ name_next_elt (int change_dirs) case NELT_FMASK: matching_flags = ep->v.matching_flags; + recursion_option = matching_flags & FNM_LEADING_DIR; name_list_advance (); continue; @@ -1370,12 +1373,6 @@ new_name (const char *file_name, const char *name) return buffer; } -/* Return nonzero if file NAME is excluded. */ -bool -excluded_name (char const *name) -{ - return excluded_file_name (excluded, name + FILE_SYSTEM_PREFIX_LEN (name)); -} /* Return the size of the prefix of FILE_NAME that is removed after diff --git a/src/sparse.c b/src/sparse.c index 417d4ff..6a97676 100644 --- a/src/sparse.c +++ b/src/sparse.c @@ -1,6 +1,6 @@ /* Functions for dealing with sparse files - Copyright 2003-2007, 2010, 2013 Free Software Foundation, Inc. + Copyright 2003-2007, 2010, 2013-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -809,6 +809,7 @@ star_get_sparse_info (struct tar_sparse_file *file) set_next_block_after (h); for (i = 0; i < SPARSES_IN_STAR_EXT_HEADER && rc == add_ok; i++) rc = oldgnu_add_sparse (file, &h->star_ext_header.sp[i]); + file->dumped_size += BLOCKSIZE; } if (rc == add_fail) diff --git a/src/suffix.c b/src/suffix.c index cf8056c..ac34cba 100644 --- a/src/suffix.c +++ b/src/suffix.c @@ -1,5 +1,5 @@ /* This file is part of GNU tar. - Copyright 2007, 2009, 2013 Free Software Foundation, Inc. + Copyright 2007, 2009, 2013-2014 Free Software Foundation, Inc. Written by Sergey Poznyakoff. @@ -29,6 +29,7 @@ struct compression_suffix static struct compression_suffix compression_suffixes[] = { #define __CAT2__(a,b) a ## b #define S(s,p) #s, sizeof (#s) - 1, __CAT2__(p,_PROGRAM) + { "tar", 3, NULL }, { S(gz, GZIP) }, { S(tgz, GZIP) }, { S(taz, GZIP) }, @@ -44,33 +45,43 @@ static struct compression_suffix compression_suffixes[] = { { S(lzo, LZOP) }, { S(xz, XZ) }, { S(txz, XZ) }, /* Slackware */ + { NULL } #undef S #undef __CAT2__ }; -static int nsuffixes = sizeof (compression_suffixes) / - sizeof (compression_suffixes[0]); - -static const char * -find_compression_program (const char *name, const char *defprog) +static struct compression_suffix const * +find_compression_suffix (const char *name, size_t *ret_len) { char *suf = strrchr (name, '.'); if (suf) { - int i; size_t len; - + struct compression_suffix *p; + suf++; len = strlen (suf); - for (i = 0; i < nsuffixes; i++) + for (p = compression_suffixes; p->suffix; p++) { - if (compression_suffixes[i].length == len - && memcmp (compression_suffixes[i].suffix, suf, len) == 0) - return compression_suffixes[i].program; + if (p->length == len && memcmp (p->suffix, suf, len) == 0) + { + if (ret_len) + *ret_len = strlen (name) - len - 1; + return p; + } } } + return NULL; +} + +static const char * +find_compression_program (const char *name, const char *defprog) +{ + struct compression_suffix const *p = find_compression_suffix (name, NULL); + if (p) + return p->program; return defprog; } @@ -81,3 +92,23 @@ set_compression_program_by_suffix (const char *name, const char *defprog) if (program) use_compress_program_option = program; } + +char * +strip_compression_suffix (const char *name) +{ + char *s = NULL; + size_t len; + + if (find_compression_suffix (name, &len)) + { + if (strncmp (name + len - 4, ".tar", 4) == 0) + len -= 4; + if (len == 0) + return NULL; + s = xmalloc (len + 1); + memcpy (s, name, len); + s[len] = 0; + } + return s; +} + diff --git a/src/system.c b/src/system.c index e1fd263..9414233 100644 --- a/src/system.c +++ b/src/system.c @@ -1,6 +1,6 @@ /* System-dependent calls for tar. - Copyright 2003-2008, 2010, 2013 Free Software Foundation, Inc. + Copyright 2003-2008, 2010, 2013-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the @@ -720,7 +720,7 @@ stat_to_env (char *name, char type, struct tar_stat_info *st) } static pid_t global_pid; -static RETSIGTYPE (*pipe_handler) (int sig); +static void (*pipe_handler) (int sig); int sys_exec_command (char *file_name, int typechar, struct tar_stat_info *st) @@ -788,7 +788,7 @@ sys_exec_info_script (const char **archive_name, int volume_number) pid_t pid; char uintbuf[UINTMAX_STRSIZE_BOUND]; int p[2]; - static RETSIGTYPE (*saved_handler) (int sig); + static void (*saved_handler) (int sig); xpipe (p); saved_handler = signal (SIGPIPE, SIG_IGN); diff --git a/src/tar.c b/src/tar.c index 4f5017d..cd32379 100644 --- a/src/tar.c +++ b/src/tar.c @@ -1,6 +1,6 @@ /* A tar (tape archiver) program. - Copyright 1988, 1992-1997, 1999-2001, 2003-2007, 2012-2013 Free + Copyright 1988, 1992-1997, 1999-2001, 2003-2007, 2012-2014 Free Software Foundation, Inc. Written by John Gilmore, starting 1985-08-25. @@ -51,6 +51,7 @@ #include #include #include +#include /* Local declarations. */ @@ -83,7 +84,7 @@ void request_stdin (const char *option) { if (stdin_used_by) - USAGE_ERROR ((0, 0, _("Options '-%s' and '-%s' both want standard input"), + USAGE_ERROR ((0, 0, _("Options '%s' and '%s' both want standard input"), stdin_used_by, option)); stdin_used_by = option; @@ -166,6 +167,14 @@ set_archive_format (char const *name) archive_format = p->fmt; } +static void +set_xattr_option (int value) +{ + if (value == 1) + set_archive_format ("posix"); + xattrs_option = value; +} + const char * archive_format_string (enum archive_format fmt) { @@ -275,10 +284,13 @@ enum EXCLUDE_CACHES_UNDER_OPTION, EXCLUDE_CACHES_ALL_OPTION, EXCLUDE_OPTION, + EXCLUDE_IGNORE_OPTION, + EXCLUDE_IGNORE_RECURSIVE_OPTION, EXCLUDE_TAG_OPTION, EXCLUDE_TAG_UNDER_OPTION, EXCLUDE_TAG_ALL_OPTION, EXCLUDE_VCS_OPTION, + EXCLUDE_VCS_IGNORES_OPTION, FORCE_LOCAL_OPTION, FULL_TIME_OPTION, GROUP_OPTION, @@ -319,6 +331,7 @@ enum OCCURRENCE_OPTION, OLD_ARCHIVE_OPTION, ONE_FILE_SYSTEM_OPTION, + ONE_TOP_LEVEL_OPTION, OVERWRITE_DIR_OPTION, OVERWRITE_OPTION, OWNER_OPTION, @@ -341,6 +354,7 @@ enum SHOW_SNAPSHOT_FIELD_RANGES_OPTION, SHOW_TRANSFORMED_NAMES_OPTION, SKIP_OLD_FILES_OPTION, + SORT_OPTION, SPARSE_VERSION_OPTION, STRIP_COMPONENTS_OPTION, SUFFIX_OPTION, @@ -489,6 +503,9 @@ static struct argp_option options[] = { {"keep-directory-symlink", KEEP_DIRECTORY_SYMLINK_OPTION, 0, 0, N_("preserve existing symlinks to directories when extracting"), GRID+1 }, + {"one-top-level", ONE_TOP_LEVEL_OPTION, N_("DIR"), OPTION_ARG_OPTIONAL, + N_("create a subdirectory to avoid having loose files extracted"), + GRID+1 }, #undef GRID #define GRID 40 @@ -547,6 +564,13 @@ static struct argp_option options[] = { " directories until the end of extraction"), GRID+1 }, {"no-delay-directory-restore", NO_DELAY_DIRECTORY_RESTORE_OPTION, 0, 0, N_("cancel the effect of --delay-directory-restore option"), GRID+1 }, + {"sort", SORT_OPTION, N_("ORDER"), 0, +#if D_INO_IN_DIRENT + N_("directory sorting order: none (default), name or inode" +#else + N_("directory sorting order: none (default) or name" +#endif + ), GRID+1 }, #undef GRID #define GRID 55 @@ -693,9 +717,9 @@ static struct argp_option options[] = { {"no-null", NO_NULL_OPTION, 0, 0, N_("disable the effect of the previous --null option"), GRID+1 }, {"unquote", UNQUOTE_OPTION, 0, 0, - N_("unquote filenames read with -T (default)"), GRID+1 }, + N_("unquote input file or member names (default)"), GRID+1 }, {"no-unquote", NO_UNQUOTE_OPTION, 0, 0, - N_("do not unquote filenames read with -T"), GRID+1 }, + N_("do not unquote input file or member names"), GRID+1 }, {"exclude", EXCLUDE_OPTION, N_("PATTERN"), 0, N_("exclude files, given as a PATTERN"), GRID+1 }, {"exclude-from", 'X', N_("FILE"), 0, @@ -711,12 +735,20 @@ static struct argp_option options[] = { {"exclude-tag", EXCLUDE_TAG_OPTION, N_("FILE"), 0, N_("exclude contents of directories containing FILE, except" " for FILE itself"), GRID+1 }, + {"exclude-ignore", EXCLUDE_IGNORE_OPTION, N_("FILE"), 0, + N_("read exclude patterns for each directory from FILE, if it exists"), + GRID+1 }, + {"exclude-ignore-recursive", EXCLUDE_IGNORE_RECURSIVE_OPTION, N_("FILE"), 0, + N_("read exclude patterns for each directory and its subdirectories " + "from FILE, if it exists"), GRID+1 }, {"exclude-tag-under", EXCLUDE_TAG_UNDER_OPTION, N_("FILE"), 0, N_("exclude everything under directories containing FILE"), GRID+1 }, {"exclude-tag-all", EXCLUDE_TAG_ALL_OPTION, N_("FILE"), 0, N_("exclude directories containing FILE"), GRID+1 }, {"exclude-vcs", EXCLUDE_VCS_OPTION, NULL, 0, N_("exclude version control system directories"), GRID+1 }, + {"exclude-vcs-ignores", EXCLUDE_VCS_IGNORES_OPTION, NULL, 0, + N_("read exclude patterns from the VCS ignore files"), GRID+1 }, {"exclude-backups", EXCLUDE_BACKUPS_OPTION, NULL, 0, N_("exclude backup and lock files"), GRID+1 }, {"no-recursion", NO_RECURSION_OPTION, 0, 0, @@ -990,7 +1022,7 @@ set_use_compress_program_option (const char *string) use_compress_program_option = string; } -static RETSIGTYPE +static void sigstat (int signo) { compute_duration (); @@ -1167,6 +1199,9 @@ tar_help_filter (int key, const char *text, void *input) s = xasprintf (_("filter the archive through %s"), LZMA_PROGRAM); break; + case LZOP_OPTION: + s = xasprintf (_("filter the archive through %s"), LZOP_PROGRAM); + case 'J': s = xasprintf (_("filter the archive through %s"), XZ_PROGRAM); break; @@ -1303,6 +1338,21 @@ parse_owner_group (char *arg, uintmax_t field_max, char const **name_option) /* Either NL or NUL, as decided by the --null option. */ static char filename_terminator; +static char const *const sort_mode_arg[] = { + "none", + "name", + "inode", + NULL +}; + +static int sort_mode_flag[] = { + SAVEDIR_SORT_NONE, + SAVEDIR_SORT_NAME, + SAVEDIR_SORT_INODE +}; + +ARGMATCH_VERIFY (sort_mode_arg, sort_mode_flag); + static error_t parse_opt (int key, char *arg, struct argp_state *state) { @@ -1438,6 +1488,11 @@ parse_opt (int key, char *arg, struct argp_state *state) one_file_system_option = true; break; + case ONE_TOP_LEVEL_OPTION: + one_top_level_option = true; + one_top_level_dir = arg; + break; + case 'l': check_links_option = 1; break; @@ -1732,6 +1787,14 @@ parse_opt (int key, char *arg, struct argp_state *state) cachedir_file_p); break; + case EXCLUDE_IGNORE_OPTION: + excfile_add (arg, EXCL_NON_RECURSIVE); + break; + + case EXCLUDE_IGNORE_RECURSIVE_OPTION: + excfile_add (arg, EXCL_RECURSIVE); + break; + case EXCLUDE_TAG_OPTION: add_exclusion_tag (arg, exclusion_tag_contents, NULL); break; @@ -1748,6 +1811,10 @@ parse_opt (int key, char *arg, struct argp_state *state) add_exclude_array (vcs_file_table, 0); break; + case EXCLUDE_VCS_IGNORES_OPTION: + exclude_vcs_ignores (); + break; + case FORCE_LOCAL_OPTION: force_local_option = true; break; @@ -1775,7 +1842,7 @@ parse_opt (int key, char *arg, struct argp_state *state) case KEEP_DIRECTORY_SYMLINK_OPTION: keep_directory_symlink_option = true; break; - + case KEEP_NEWER_FILES_OPTION: old_files_option = KEEP_NEWER_FILES; break; @@ -1985,6 +2052,11 @@ parse_opt (int key, char *arg, struct argp_state *state) show_transformed_names_option = true; break; + case SORT_OPTION: + savedir_sort_order = XARGMATCH ("--sort", arg, + sort_mode_arg, sort_mode_flag); + break; + case SUFFIX_OPTION: backup_option = true; args->backup_suffix_string = arg; @@ -2054,16 +2126,16 @@ parse_opt (int key, char *arg, struct argp_state *state) break; case XATTR_OPTION: - set_archive_format ("posix"); - xattrs_option = 1; + set_xattr_option (1); break; case NO_XATTR_OPTION: - xattrs_option = -1; + set_xattr_option (-1); break; case XATTR_INCLUDE: case XATTR_EXCLUDE: + set_xattr_option (1); xattrs_mask_add (arg, (key == XATTR_INCLUDE)); break; @@ -2220,9 +2292,17 @@ static int subcommand_class[] = { /* Return t if the subcommand_option is in class(es) f */ #define IS_SUBCOMMAND_CLASS(f) (subcommand_class[subcommand_option] & (f)) - + static struct tar_args args; +static void +option_conflict_error (const char *a, const char *b) +{ + /* TRANSLATORS: Both %s in this statement are replaced with + option names. */ + USAGE_ERROR ((0, 0, _("'%s' cannot be used with '%s'"), a, b)); +} + static void decode_options (int argc, char **argv) { @@ -2247,6 +2327,7 @@ decode_options (int argc, char **argv) blocking_factor = DEFAULT_BLOCKING; record_size = DEFAULT_BLOCKING * BLOCKSIZE; excluded = new_exclude (); + newer_mtime_option.tv_sec = TYPE_MINIMUM (time_t); newer_mtime_option.tv_nsec = -1; recursion_option = FNM_LEADING_DIR; @@ -2254,6 +2335,8 @@ decode_options (int argc, char **argv) tar_sparse_major = 1; tar_sparse_minor = 0; + savedir_sort_order = SAVEDIR_SORT_NONE; + owner_option = -1; owner_name_option = NULL; group_option = -1; group_name_option = NULL; @@ -2385,9 +2468,8 @@ decode_options (int argc, char **argv) USAGE_ERROR ((0, 0, _("--occurrence is meaningless without a file list"))); if (!IS_SUBCOMMAND_CLASS (SUBCL_OCCUR)) - USAGE_ERROR ((0, 0, - _("--occurrence cannot be used with %s"), - subcommand_string (subcommand_option))); + option_conflict_error ("--occurrence", + subcommand_string (subcommand_option)); } if (archive_names == 0) @@ -2409,8 +2491,8 @@ decode_options (int argc, char **argv) if (listed_incremental_option && NEWER_OPTION_INITIALIZED (newer_mtime_option)) - USAGE_ERROR ((0, 0, - _("Cannot combine --listed-incremental with --newer"))); + option_conflict_error ("--listed-incremental", "--newer"); + if (incremental_level != -1 && !listed_incremental_option) WARN ((0, 0, _("--level is meaningless without --listed-incremental"))); @@ -2447,8 +2529,8 @@ decode_options (int argc, char **argv) if (use_compress_program_option) USAGE_ERROR ((0, 0, _("Cannot verify compressed archives"))); if (!IS_SUBCOMMAND_CLASS (SUBCL_WRITE)) - USAGE_ERROR ((0, 0, _("--verify cannot be used with %s"), - subcommand_string (subcommand_option))); + option_conflict_error ("--verify", + subcommand_string (subcommand_option)); } if (use_compress_program_option) @@ -2487,13 +2569,36 @@ decode_options (int argc, char **argv) && !IS_SUBCOMMAND_CLASS (SUBCL_READ)) USAGE_ERROR ((0, 0, _("--xattrs can be used only on POSIX archives"))); - if ((starting_file_option || same_order_option) - && !IS_SUBCOMMAND_CLASS (SUBCL_READ)) - USAGE_ERROR ((0, 0, - _("--%s option cannot be used with %s"), - starting_file_option ? "starting-file" : "same-order", - subcommand_string (subcommand_option))); - + if (starting_file_option && !IS_SUBCOMMAND_CLASS (SUBCL_READ)) + option_conflict_error ("--starting-file", + subcommand_string (subcommand_option)); + + if (same_order_option && !IS_SUBCOMMAND_CLASS (SUBCL_READ)) + option_conflict_error ("--same-order", + subcommand_string (subcommand_option)); + + if (one_top_level_option) + { + char *base; + + if (absolute_names_option) + option_conflict_error ("--one-top-level", "--absolute-names"); + + if (!one_top_level_dir) + { + /* If the user wants to guarantee that everything is under one + directory, determine its name now and let it be created later. */ + base = base_name (archive_name_array[0]); + one_top_level_dir = strip_compression_suffix (base); + free (base); + + if (!one_top_level_dir) + USAGE_ERROR ((0, 0, + _("Cannot deduce top-level directory name; " + "please set it explicitly with --one-top-level=DIR"))); + } + } + /* If ready to unlink hierarchies, so we are for simpler files. */ if (recursive_unlink_option) old_files_option = UNLINK_FIRST_OLD_FILES; @@ -2525,8 +2630,7 @@ decode_options (int argc, char **argv) USAGE_ERROR ((0, 0, _("Volume length cannot be less than record size"))); if (same_order_option && listed_incremental_option) - USAGE_ERROR ((0, 0, _("--preserve-order is not compatible with " - "--listed-incremental"))); + option_conflict_error ("--preserve-order", "--listed-incremental"); /* Forbid using -c with no input files whatsoever. Check that '-f -', explicit or implied, is used correctly. */ @@ -2623,6 +2727,8 @@ main (int argc, char **argv) exit_failure = TAREXIT_FAILURE; exit_status = TAREXIT_SUCCESS; + error_hook = checkpoint_flush_actions; + filename_terminator = '\n'; set_quoting_style (0, DEFAULT_QUOTING_STYLE); @@ -2696,6 +2802,8 @@ main (int argc, char **argv) test_archive_label (); } + checkpoint_finish (); + if (totals_option) print_total_stats (); @@ -2765,6 +2873,7 @@ tar_stat_destroy (struct tar_stat_info *st) free (st->sparse_map); free (st->dumpdir); xheader_destroy (&st->xhdr); + info_free_exclist (st); memset (st, 0, sizeof (*st)); } diff --git a/src/tar.h b/src/tar.h index 70055af..3d69399 100644 --- a/src/tar.h +++ b/src/tar.h @@ -1,7 +1,7 @@ /* GNU tar Archive Format description. - Copyright 1988-1989, 1991-1997, 2000-2001, 2003-2007, 2012-2013 - Free Software Foundation, Inc. + Copyright 1988-1989, 1991-1997, 2000-2001, 2003-2007, 2012-2014 Free + Software Foundation, Inc. This file is part of GNU tar. @@ -358,6 +358,9 @@ struct tar_stat_info It is negative if it could not be reopened after it was closed. Negate it to find out what errno was when the reopen failed. */ int fd; + + /* Exclusion list */ + struct exclist *exclude_list; }; union block diff --git a/src/transform.c b/src/transform.c index cf0189c..cd9e27c 100644 --- a/src/transform.c +++ b/src/transform.c @@ -1,5 +1,5 @@ /* This file is part of GNU tar. - Copyright 2006-2008, 2013 Free Software Foundation, Inc. + Copyright 2006-2008, 2013-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the diff --git a/src/unlink.c b/src/unlink.c index 6677148..7f86cc5 100644 --- a/src/unlink.c +++ b/src/unlink.c @@ -1,6 +1,6 @@ /* Unlink files. - Copyright 2009, 2013 Free Software Foundation, Inc. + Copyright 2009, 2013-2014 Free Software Foundation, Inc. This file is part of GNU tar. @@ -73,7 +73,7 @@ flush_deferred_unlinks (bool force) { struct deferred_unlink *p, *prev = NULL; int saved_chdir = chdir_current; - + for (p = dunlink_head; p; ) { struct deferred_unlink *next = p->next; @@ -86,15 +86,16 @@ flush_deferred_unlinks (bool force) { const char *fname; - if (p->file_name[0] == 0 || - strcmp (p->file_name, ".") == 0) + if (p->dir_idx + && (p->file_name[0] == 0 + || strcmp (p->file_name, ".") == 0)) { fname = tar_dirname (); chdir_do (p->dir_idx - 1); } else fname = p->file_name; - + if (unlinkat (chdir_fd, fname, AT_REMOVEDIR) != 0) { switch (errno) diff --git a/src/update.c b/src/update.c index 72141b2..c8fca0c 100644 --- a/src/update.c +++ b/src/update.c @@ -1,7 +1,7 @@ /* Update a tar archive. - Copyright 1988, 1992, 1994, 1996-1997, 1999-2001, 2003-2005, 2007, 2010, - 2013 Free Software Foundation, Inc. + Copyright 1988, 1992, 1994, 1996-1997, 1999-2001, 2003-2005, 2007, + 2010, 2013-2014 Free Software Foundation, Inc. This file is part of GNU tar. @@ -216,7 +216,7 @@ update_archive (void) while ((p = name_from_list ()) != NULL) { char *file_name = p->name; - if (excluded_name (file_name)) + if (excluded_name (file_name, NULL)) continue; if (interactive_option && !confirm ("add", file_name)) continue; diff --git a/src/utf8.c b/src/utf8.c index 5af8456..07a3904 100644 --- a/src/utf8.c +++ b/src/utf8.c @@ -1,6 +1,6 @@ /* Charset handling for GNU tar. - Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. + Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. This file is part of GNU tar. diff --git a/src/warning.c b/src/warning.c index d58a575..1cea316 100644 --- a/src/warning.c +++ b/src/warning.c @@ -1,6 +1,6 @@ /* Warnings for GNU tar. - Copyright 2009, 2012-2013 Free Software Foundation, Inc. + Copyright 2009, 2012-2014 Free Software Foundation, Inc. This file is part of GNU tar. diff --git a/src/xattrs.c b/src/xattrs.c index dac15f3..307ee38 100644 --- a/src/xattrs.c +++ b/src/xattrs.c @@ -1,6 +1,6 @@ /* Support for extended attributes. - Copyright (C) 2006-2013 Free Software Foundation, Inc. + Copyright (C) 2006-2014 Free Software Foundation, Inc. This file is part of GNU tar. @@ -61,6 +61,7 @@ static struct static acl_t acl_get_file_at (int, const char *, acl_type_t); static int acl_set_file_at (int, const char *, acl_type_t, acl_t); static int file_has_acl_at (int, char const *, struct stat const *); +static int acl_delete_def_file_at (int, char const *); /* acl_get_file_at */ #define AT_FUNC_NAME acl_get_file_at @@ -88,6 +89,17 @@ static int file_has_acl_at (int, char const *, struct stat const *); #undef AT_FUNC_POST_FILE_PARAM_DECLS #undef AT_FUNC_POST_FILE_ARGS +/* acl_delete_def_file_at */ +#define AT_FUNC_NAME acl_delete_def_file_at +#define AT_FUNC_F1 acl_delete_def_file +#define AT_FUNC_POST_FILE_PARAM_DECLS +#define AT_FUNC_POST_FILE_ARGS +#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 + /* gnulib file_has_acl_at */ #define AT_FUNC_NAME file_has_acl_at #define AT_FUNC_F1 file_has_acl @@ -187,7 +199,8 @@ fixup_extra_acl_fields (char *ptr) return ptr; } -/* "system.posix_acl_access" */ +/* Set the "system.posix_acl_access/system.posix_acl_default" extended + attribute. Called only when acls_option > 0. */ static void xattrs__acls_set (struct tar_stat_info const *st, char const *file_name, int type, @@ -199,15 +212,23 @@ xattrs__acls_set (struct tar_stat_info const *st, { /* assert (strlen (ptr) == len); */ ptr = fixup_extra_acl_fields (ptr); - acl = acl_from_text (ptr); - acls_option = 1; } - else if (acls_option > 0) - acl = perms2acl (st->stat.st_mode); + else if (def) + { + /* No "default" IEEE 1003.1e ACL set for directory. At this moment, + FILE_NAME may already have inherited default acls from parent + directory; clean them up. */ + if (acl_delete_def_file_at (chdir_fd, file_name)) + WARNOPT (WARN_XATTR_WRITE, + (0, errno, + _("acl_delete_def_file_at: Cannot drop default POSIX ACLs " + "for file '%s'"), + file_name)); + return; + } else - return; /* don't call acl functions unless we first hit an ACL, or - --acls was passed explicitly */ + acl = perms2acl (st->stat.st_mode); if (!acl) { @@ -695,7 +716,7 @@ xattrs_print_char (struct tar_stat_info const *st, char *output) if (selinux_context_option > 0 && st->cntx_name) *output = '.'; - if (acls_option && (st->acls_a_len || st->acls_d_len)) + if (acls_option > 0 && (st->acls_a_len || st->acls_d_len)) *output = '+'; } @@ -706,11 +727,11 @@ xattrs_print (struct tar_stat_info const *st) return; /* selinux */ - if (selinux_context_option && st->cntx_name) + if (selinux_context_option > 0 && st->cntx_name) fprintf (stdlis, " s: %s\n", st->cntx_name); /* acls */ - if (acls_option && (st->acls_a_len || st->acls_d_len)) + if (acls_option > 0 && (st->acls_a_len || st->acls_d_len)) { fprintf (stdlis, " a: "); acls_one_line ("", ',', st->acls_a_ptr, st->acls_a_len); @@ -719,7 +740,7 @@ xattrs_print (struct tar_stat_info const *st) } /* xattrs */ - if (xattrs_option && st->xattr_map_size) + if (xattrs_option > 0 && st->xattr_map_size) { int i; diff --git a/src/xattrs.h b/src/xattrs.h index fc73c55..8363061 100644 --- a/src/xattrs.h +++ b/src/xattrs.h @@ -1,6 +1,6 @@ /* Support for extended attributes. - Copyright (C) 2006-2013 Free Software Foundation, Inc. + Copyright (C) 2006-2014 Free Software Foundation, Inc. This file is part of GNU tar. diff --git a/src/xheader.c b/src/xheader.c index c8c54b6..c94c6d3 100644 --- a/src/xheader.c +++ b/src/xheader.c @@ -1,6 +1,7 @@ /* POSIX extended headers for tar. - Copyright (C) 2003-2007, 2009-2010, 2012-2013 Free Software Foundation, Inc. + Copyright (C) 2003-2007, 2009-2010, 2012-2014 Free Software + Foundation, Inc. This file is part of GNU tar. diff --git a/tests/Makefile.am b/tests/Makefile.am index fc72c51..6684d1d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -116,6 +116,7 @@ TESTSUITE_AT = \ incr09.at\ indexfile.at\ ignfail.at\ + iotty.at\ label01.at\ label02.at\ label03.at\ @@ -144,6 +145,10 @@ TESTSUITE_AT = \ multiv07.at\ multiv08.at\ old.at\ + onetop01.at\ + onetop02.at\ + onetop03.at\ + onetop04.at\ opcomp01.at\ opcomp02.at\ opcomp03.at\ @@ -155,6 +160,7 @@ TESTSUITE_AT = \ owner.at\ pipe.at\ recurse.at\ + recurs02.at\ rename01.at\ rename02.at\ rename03.at\ @@ -181,6 +187,7 @@ TESTSUITE_AT = \ remfiles09a.at\ remfiles09b.at\ remfiles09c.at\ + remfiles10.at\ same-order01.at\ same-order02.at\ shortfile.at\ @@ -221,6 +228,7 @@ TESTSUITE_AT = \ xattr05.at\ acls01.at\ acls02.at\ + acls03.at\ selnx01.at\ selacl01.at\ capabs_raw01.at @@ -257,8 +265,14 @@ installcheck-local: check_PROGRAMS = genfile +if TAR_COND_GRANTPT +check_PROGRAMS += ttyemu +endif + genfile_SOURCES = genfile.c argcv.c argcv.h +ttyemu_SOURCES = ttyemu.c + localedir = $(datadir)/locale AM_CPPFLAGS = \ -I$(top_srcdir)/gnu\ diff --git a/tests/Makefile.in b/tests/Makefile.in index c0528b2..6807509 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.12.6 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -33,23 +33,51 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -67,16 +95,17 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -check_PROGRAMS = genfile$(EXEEXT) +check_PROGRAMS = genfile$(EXEEXT) $(am__EXEEXT_1) +@TAR_COND_GRANTPT_TRUE@am__append_1 = ttyemu subdir = tests -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/atlocal.in $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ - $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/alloca.m4 \ - $(top_srcdir)/m4/argp.m4 $(top_srcdir)/m4/backupfile.m4 \ - $(top_srcdir)/m4/bison.m4 $(top_srcdir)/m4/btowc.m4 \ - $(top_srcdir)/m4/canonicalize.m4 \ + $(top_srcdir)/m4/absolute-header.m4 $(top_srcdir)/m4/acl.m4 \ + $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/argp.m4 \ + $(top_srcdir)/m4/backupfile.m4 $(top_srcdir)/m4/bison.m4 \ + $(top_srcdir)/m4/btowc.m4 $(top_srcdir)/m4/canonicalize.m4 \ $(top_srcdir)/m4/chdir-long.m4 $(top_srcdir)/m4/chown.m4 \ $(top_srcdir)/m4/clock_time.m4 \ $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/close.m4 \ @@ -88,9 +117,10 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/double-slash-root.m4 $(top_srcdir)/m4/dup.m4 \ $(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/eealloc.m4 \ $(top_srcdir)/m4/environ.m4 $(top_srcdir)/m4/errno_h.m4 \ - $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/exponentd.m4 \ - $(top_srcdir)/m4/extensions.m4 \ - $(top_srcdir)/m4/extern-inline.m4 $(top_srcdir)/m4/fchdir.m4 \ + $(top_srcdir)/m4/error.m4 $(top_srcdir)/m4/euidaccess.m4 \ + $(top_srcdir)/m4/exponentd.m4 $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/extern-inline.m4 \ + $(top_srcdir)/m4/faccessat.m4 $(top_srcdir)/m4/fchdir.m4 \ $(top_srcdir)/m4/fchmodat.m4 $(top_srcdir)/m4/fchownat.m4 \ $(top_srcdir)/m4/fcntl-o.m4 $(top_srcdir)/m4/fcntl.m4 \ $(top_srcdir)/m4/fcntl_h.m4 $(top_srcdir)/m4/fdopendir.m4 \ @@ -102,19 +132,21 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/getcwd-abort-bug.m4 \ $(top_srcdir)/m4/getcwd-path-max.m4 $(top_srcdir)/m4/getcwd.m4 \ $(top_srcdir)/m4/getdelim.m4 $(top_srcdir)/m4/getdtablesize.m4 \ - $(top_srcdir)/m4/getline.m4 $(top_srcdir)/m4/getopt.m4 \ - $(top_srcdir)/m4/getpagesize.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/gettime.m4 $(top_srcdir)/m4/gettimeofday.m4 \ - $(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnulib-common.m4 \ - $(top_srcdir)/m4/gnulib-comp.m4 $(top_srcdir)/m4/human.m4 \ + $(top_srcdir)/m4/getgroups.m4 $(top_srcdir)/m4/getline.m4 \ + $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/getpagesize.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/gettime.m4 \ + $(top_srcdir)/m4/gettimeofday.m4 $(top_srcdir)/m4/glibc21.m4 \ + $(top_srcdir)/m4/gnulib-common.m4 \ + $(top_srcdir)/m4/gnulib-comp.m4 \ + $(top_srcdir)/m4/group-member.m4 $(top_srcdir)/m4/human.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/include_next.m4 \ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intmax_t.m4 \ $(top_srcdir)/m4/inttostr.m4 $(top_srcdir)/m4/inttypes-pri.m4 \ $(top_srcdir)/m4/inttypes.m4 $(top_srcdir)/m4/inttypes_h.m4 \ - $(top_srcdir)/m4/iswblank.m4 $(top_srcdir)/m4/langinfo_h.m4 \ - $(top_srcdir)/m4/largefile.m4 $(top_srcdir)/m4/lchown.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/isatty.m4 $(top_srcdir)/m4/iswblank.m4 \ + $(top_srcdir)/m4/langinfo_h.m4 $(top_srcdir)/m4/largefile.m4 \ + $(top_srcdir)/m4/lchown.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ $(top_srcdir)/m4/libunistring-base.m4 \ $(top_srcdir)/m4/link-follow.m4 $(top_srcdir)/m4/link.m4 \ $(top_srcdir)/m4/linkat.m4 $(top_srcdir)/m4/localcharset.m4 \ @@ -140,19 +172,21 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.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/paxutils.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/printf.m4 \ - $(top_srcdir)/m4/priv-set.m4 $(top_srcdir)/m4/progtest.m4 \ - $(top_srcdir)/m4/quote.m4 $(top_srcdir)/m4/quotearg.m4 \ - $(top_srcdir)/m4/raise.m4 $(top_srcdir)/m4/rawmemchr.m4 \ - $(top_srcdir)/m4/read.m4 $(top_srcdir)/m4/readdir.m4 \ - $(top_srcdir)/m4/readlink.m4 $(top_srcdir)/m4/readlinkat.m4 \ - $(top_srcdir)/m4/realloc.m4 $(top_srcdir)/m4/regex.m4 \ - $(top_srcdir)/m4/rename.m4 $(top_srcdir)/m4/renameat.m4 \ - $(top_srcdir)/m4/rewinddir.m4 $(top_srcdir)/m4/rmdir.m4 \ - $(top_srcdir)/m4/rmt.m4 $(top_srcdir)/m4/rpmatch.m4 \ - $(top_srcdir)/m4/rtapelib.m4 $(top_srcdir)/m4/safe-read.m4 \ - $(top_srcdir)/m4/safe-write.m4 $(top_srcdir)/m4/save-cwd.m4 \ - $(top_srcdir)/m4/savedir.m4 $(top_srcdir)/m4/secure_getenv.m4 \ + $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix_openpt.m4 \ + $(top_srcdir)/m4/printf.m4 $(top_srcdir)/m4/priv-set.m4 \ + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/ptsname.m4 \ + $(top_srcdir)/m4/ptsname_r.m4 $(top_srcdir)/m4/quote.m4 \ + $(top_srcdir)/m4/quotearg.m4 $(top_srcdir)/m4/raise.m4 \ + $(top_srcdir)/m4/rawmemchr.m4 $(top_srcdir)/m4/read.m4 \ + $(top_srcdir)/m4/readdir.m4 $(top_srcdir)/m4/readlink.m4 \ + $(top_srcdir)/m4/readlinkat.m4 $(top_srcdir)/m4/realloc.m4 \ + $(top_srcdir)/m4/regex.m4 $(top_srcdir)/m4/rename.m4 \ + $(top_srcdir)/m4/renameat.m4 $(top_srcdir)/m4/rewinddir.m4 \ + $(top_srcdir)/m4/rmdir.m4 $(top_srcdir)/m4/rmt.m4 \ + $(top_srcdir)/m4/rpmatch.m4 $(top_srcdir)/m4/rtapelib.m4 \ + $(top_srcdir)/m4/safe-read.m4 $(top_srcdir)/m4/safe-write.m4 \ + $(top_srcdir)/m4/save-cwd.m4 $(top_srcdir)/m4/savedir.m4 \ + $(top_srcdir)/m4/secure_getenv.m4 \ $(top_srcdir)/m4/selinux-context-h.m4 \ $(top_srcdir)/m4/selinux-selinux-h.m4 \ $(top_srcdir)/m4/setenv.m4 $(top_srcdir)/m4/signal_h.m4 \ @@ -165,20 +199,23 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ $(top_srcdir)/m4/stdio_h.m4 $(top_srcdir)/m4/stdlib_h.m4 \ $(top_srcdir)/m4/stpcpy.m4 $(top_srcdir)/m4/strcase.m4 \ $(top_srcdir)/m4/strchrnul.m4 $(top_srcdir)/m4/strdup.m4 \ - $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/string_h.m4 \ - $(top_srcdir)/m4/strings_h.m4 $(top_srcdir)/m4/strndup.m4 \ - $(top_srcdir)/m4/strnlen.m4 $(top_srcdir)/m4/strtol.m4 \ - $(top_srcdir)/m4/strtoul.m4 $(top_srcdir)/m4/strtoull.m4 \ - $(top_srcdir)/m4/strtoumax.m4 $(top_srcdir)/m4/symlink.m4 \ - $(top_srcdir)/m4/symlinkat.m4 $(top_srcdir)/m4/sys_socket_h.m4 \ + $(top_srcdir)/m4/strerror.m4 $(top_srcdir)/m4/strftime.m4 \ + $(top_srcdir)/m4/string_h.m4 $(top_srcdir)/m4/strings_h.m4 \ + $(top_srcdir)/m4/strndup.m4 $(top_srcdir)/m4/strnlen.m4 \ + $(top_srcdir)/m4/strtoimax.m4 $(top_srcdir)/m4/strtol.m4 \ + $(top_srcdir)/m4/strtoll.m4 $(top_srcdir)/m4/strtoul.m4 \ + $(top_srcdir)/m4/strtoull.m4 $(top_srcdir)/m4/strtoumax.m4 \ + $(top_srcdir)/m4/symlink.m4 $(top_srcdir)/m4/symlinkat.m4 \ + $(top_srcdir)/m4/sys_socket_h.m4 \ $(top_srcdir)/m4/sys_stat_h.m4 $(top_srcdir)/m4/sys_time_h.m4 \ $(top_srcdir)/m4/sys_types_h.m4 $(top_srcdir)/m4/sysexits.m4 \ $(top_srcdir)/m4/system.m4 $(top_srcdir)/m4/tempname.m4 \ $(top_srcdir)/m4/time_h.m4 $(top_srcdir)/m4/time_r.m4 \ $(top_srcdir)/m4/timespec.m4 $(top_srcdir)/m4/tm_gmtoff.m4 \ - $(top_srcdir)/m4/unistd-safer.m4 $(top_srcdir)/m4/unistd_h.m4 \ - $(top_srcdir)/m4/unlink.m4 $(top_srcdir)/m4/unlinkat.m4 \ - $(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \ + $(top_srcdir)/m4/ttyname_r.m4 $(top_srcdir)/m4/unistd-safer.m4 \ + $(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink.m4 \ + $(top_srcdir)/m4/unlinkat.m4 $(top_srcdir)/m4/unlinkdir.m4 \ + $(top_srcdir)/m4/unlocked-io.m4 $(top_srcdir)/m4/unlockpt.m4 \ $(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utimens.m4 \ $(top_srcdir)/m4/utimensat.m4 $(top_srcdir)/m4/utimes.m4 \ $(top_srcdir)/m4/vasnprintf.m4 $(top_srcdir)/m4/vasprintf.m4 \ @@ -198,12 +235,18 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = atlocal CONFIG_CLEAN_VPATH_FILES = +@TAR_COND_GRANTPT_TRUE@am__EXEEXT_1 = ttyemu$(EXEEXT) am_genfile_OBJECTS = genfile.$(OBJEXT) argcv.$(OBJEXT) genfile_OBJECTS = $(am_genfile_OBJECTS) genfile_LDADD = $(LDADD) am__DEPENDENCIES_1 = genfile_DEPENDENCIES = ../gnu/libgnu.a $(am__DEPENDENCIES_1) \ - $(am__DEPENDENCIES_1) + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +am_ttyemu_OBJECTS = ttyemu.$(OBJEXT) +ttyemu_OBJECTS = $(am_ttyemu_OBJECTS) +ttyemu_LDADD = $(LDADD) +ttyemu_DEPENDENCIES = ../gnu/libgnu.a $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) AM_V_P = $(am__v_P_@AM_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_0 = false @@ -232,13 +275,30 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@) am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(genfile_SOURCES) -DIST_SOURCES = $(genfile_SOURCES) +SOURCES = $(genfile_SOURCES) $(ttyemu_SOURCES) +DIST_SOURCES = $(genfile_SOURCES) $(ttyemu_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -809,6 +869,7 @@ LIBUNISTRING_UNITYPES_H = @LIBUNISTRING_UNITYPES_H@ LIBUNISTRING_UNIWIDTH_H = @LIBUNISTRING_UNIWIDTH_H@ LIB_ACL = @LIB_ACL@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ +LIB_EACCESS = @LIB_EACCESS@ LIB_SELINUX = @LIB_SELINUX@ LIB_SETSOCKOPT = @LIB_SETSOCKOPT@ LOCALCHARSET_TESTS_ENVIRONMENT = @LOCALCHARSET_TESTS_ENVIRONMENT@ @@ -924,11 +985,13 @@ REPLACE_FUTIMENS = @REPLACE_FUTIMENS@ REPLACE_GETCWD = @REPLACE_GETCWD@ REPLACE_GETDELIM = @REPLACE_GETDELIM@ REPLACE_GETDOMAINNAME = @REPLACE_GETDOMAINNAME@ +REPLACE_GETDTABLESIZE = @REPLACE_GETDTABLESIZE@ REPLACE_GETGROUPS = @REPLACE_GETGROUPS@ REPLACE_GETLINE = @REPLACE_GETLINE@ REPLACE_GETLOGIN_R = @REPLACE_GETLOGIN_R@ REPLACE_GETPAGESIZE = @REPLACE_GETPAGESIZE@ REPLACE_GETTIMEOFDAY = @REPLACE_GETTIMEOFDAY@ +REPLACE_GMTIME = @REPLACE_GMTIME@ REPLACE_ISATTY = @REPLACE_ISATTY@ REPLACE_ISWBLANK = @REPLACE_ISWBLANK@ REPLACE_ISWCNTRL = @REPLACE_ISWCNTRL@ @@ -937,6 +1000,7 @@ REPLACE_LCHOWN = @REPLACE_LCHOWN@ REPLACE_LINK = @REPLACE_LINK@ REPLACE_LINKAT = @REPLACE_LINKAT@ REPLACE_LOCALECONV = @REPLACE_LOCALECONV@ +REPLACE_LOCALTIME = @REPLACE_LOCALTIME@ REPLACE_LOCALTIME_R = @REPLACE_LOCALTIME_R@ REPLACE_LSEEK = @REPLACE_LSEEK@ REPLACE_LSTAT = @REPLACE_LSTAT@ @@ -1003,6 +1067,7 @@ REPLACE_STRSTR = @REPLACE_STRSTR@ REPLACE_STRTOD = @REPLACE_STRTOD@ REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ +REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@ REPLACE_STRUCT_LCONV = @REPLACE_STRUCT_LCONV@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ @@ -1030,6 +1095,7 @@ REPLACE_WCTOMB = @REPLACE_WCTOMB@ REPLACE_WCWIDTH = @REPLACE_WCWIDTH@ REPLACE_WRITE = @REPLACE_WRITE@ RSH = @RSH@ +SED = @SED@ SELINUX_CONTEXT_H = @SELINUX_CONTEXT_H@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -1067,6 +1133,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ @@ -1111,6 +1178,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1199,6 +1267,7 @@ TESTSUITE_AT = \ incr09.at\ indexfile.at\ ignfail.at\ + iotty.at\ label01.at\ label02.at\ label03.at\ @@ -1227,6 +1296,10 @@ TESTSUITE_AT = \ multiv07.at\ multiv08.at\ old.at\ + onetop01.at\ + onetop02.at\ + onetop03.at\ + onetop04.at\ opcomp01.at\ opcomp02.at\ opcomp03.at\ @@ -1238,6 +1311,7 @@ TESTSUITE_AT = \ owner.at\ pipe.at\ recurse.at\ + recurs02.at\ rename01.at\ rename02.at\ rename03.at\ @@ -1264,6 +1338,7 @@ TESTSUITE_AT = \ remfiles09a.at\ remfiles09b.at\ remfiles09c.at\ + remfiles10.at\ same-order01.at\ same-order02.at\ shortfile.at\ @@ -1304,6 +1379,7 @@ TESTSUITE_AT = \ xattr05.at\ acls01.at\ acls02.at\ + acls03.at\ selnx01.at\ selacl01.at\ capabs_raw01.at @@ -1311,6 +1387,7 @@ TESTSUITE_AT = \ TESTSUITE = $(srcdir)/testsuite AUTOTEST = $(AUTOM4TE) --language=autotest genfile_SOURCES = genfile.c argcv.c argcv.h +ttyemu_SOURCES = ttyemu.c AM_CPPFLAGS = \ -I$(top_srcdir)/gnu\ -I../gnu\ @@ -1358,10 +1435,15 @@ atlocal: $(top_builddir)/config.status $(srcdir)/atlocal.in clean-checkPROGRAMS: -test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS) + genfile$(EXEEXT): $(genfile_OBJECTS) $(genfile_DEPENDENCIES) $(EXTRA_genfile_DEPENDENCIES) @rm -f genfile$(EXEEXT) $(AM_V_CCLD)$(LINK) $(genfile_OBJECTS) $(genfile_LDADD) $(LIBS) +ttyemu$(EXEEXT): $(ttyemu_OBJECTS) $(ttyemu_DEPENDENCIES) $(EXTRA_ttyemu_DEPENDENCIES) + @rm -f ttyemu$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(ttyemu_OBJECTS) $(ttyemu_LDADD) $(LIBS) + mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -1370,41 +1452,31 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/argcv.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/genfile.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ttyemu.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1416,15 +1488,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1433,9 +1501,10 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am -cscopelist: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP)'; \ +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ case "$(srcdir)" in \ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ *) sdir=$(subdir)/$(srcdir) ;; \ @@ -1590,18 +1659,18 @@ uninstall-am: .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am check-local clean \ - clean-checkPROGRAMS clean-generic clean-local cscopelist ctags \ - distclean distclean-compile distclean-generic distclean-tags \ - distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-dvi \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am check-local clean \ + clean-checkPROGRAMS clean-generic clean-local cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ install-dvi-am install-exec install-exec-am install-html \ install-html-am install-info install-info-am install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installcheck-local \ installdirs maintainer-clean maintainer-clean-generic \ mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ - ps ps-am tags uninstall uninstall-am + ps ps-am tags tags-am uninstall uninstall-am $(srcdir)/package.m4: $(top_srcdir)/configure.ac diff --git a/tests/T-cd.at b/tests/T-cd.at index d8fcd88..051d809 100644 --- a/tests/T-cd.at +++ b/tests/T-cd.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # This file is part of GNU tar. # diff --git a/tests/T-empty.at b/tests/T-empty.at index 5261445..2cc9435 100644 --- a/tests/T-empty.at +++ b/tests/T-empty.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/T-mult.at b/tests/T-mult.at index d011b83..70b7deb 100644 --- a/tests/T-mult.at +++ b/tests/T-mult.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # This file is part of GNU tar. # diff --git a/tests/T-nest.at b/tests/T-nest.at index 5c4b69d..3da2ec7 100644 --- a/tests/T-nest.at +++ b/tests/T-nest.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # This file is part of GNU tar. # diff --git a/tests/T-nonl.at b/tests/T-nonl.at index a694155..390c62f 100644 --- a/tests/T-nonl.at +++ b/tests/T-nonl.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # This file is part of GNU tar. # diff --git a/tests/T-null.at b/tests/T-null.at index 5db5cf4..795f64d 100644 --- a/tests/T-null.at +++ b/tests/T-null.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/T-rec.at b/tests/T-rec.at index 29965a3..9a85f17 100644 --- a/tests/T-rec.at +++ b/tests/T-rec.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # This file is part of GNU tar. # diff --git a/tests/T-zfile.at b/tests/T-zfile.at index 8761c7c..05c93e6 100644 --- a/tests/T-zfile.at +++ b/tests/T-zfile.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # This file is part of GNU tar. # diff --git a/tests/acls01.at b/tests/acls01.at index f737fdb..a866b86 100644 --- a/tests/acls01.at +++ b/tests/acls01.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2011, 2013 Free Software Foundation, Inc. +# Copyright 2011, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/acls02.at b/tests/acls02.at index 244f433..95f4429 100644 --- a/tests/acls02.at +++ b/tests/acls02.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2011, 2013 Free Software Foundation, Inc. +# Copyright 2011, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/acls03.at b/tests/acls03.at new file mode 100644 index 0000000..83c5bdc --- /dev/null +++ b/tests/acls03.at @@ -0,0 +1,131 @@ +# Process this file with autom4te to create testsuite. -*- Autotest -*- +# +# Test suite for GNU tar. +# Copyright 2013, 2014 Free Software Foundation, Inc. + +# This file is part of GNU tar. + +# GNU tar is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# GNU tar is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +# Test description: +# +# Check the storing/restoring with/without default ACLs. When --acls is passed, +# restored directory tree should always match archive contents (even when the +# archive does not contain any ACLs). +# +# References: +# http://www.mail-archive.com/bug-tar@gnu.org/msg04355.html + +AT_SETUP([acls: default ACLs]) +AT_KEYWORDS([xattrs acls acls03]) + +m4_define([ACL_LISTDIR], [ + cd $1 + $1="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. +]) + +m4_define([ACL_ASSERT], [ + echo "$$1" > $1.log + echo "$$2" > $2.log + if test ! "$$1" "$3" "$$2"; then + echo "bad '$1' against '$2' output" + fi +]) + +AT_TAR_CHECK([ +AT_XATTRS_UTILS_PREREQ +AT_ACLS_PREREQ +AT_SORT_PREREQ + +MYNAME=$( id -un ) +MYGROUP=$( id -gn ) + +# Prepare directory structure with default ACLs +mkdir -p pure/d1/d2 +genfile --file pure/d1/f2a +genfile --file pure/d1/f2b +genfile --file pure/d1/d2/f3a +genfile --file pure/d1/d2/f3b +setfacl -m g:$MYGROUP:r-x pure/d1 +setfacl -d -m g:$MYGROUP:rwx pure/d1 +setfacl -d -m u:$MYNAME:rwx pure/d1 +# "*a" files have "some" additional ACLs +setfacl -m u:$MYNAME:--- pure/d1/d2/f3a +setfacl -m u:$MYNAME:--- pure/d1/f2a + +# use default format (no acls stored) +tar -cf noacl.tar -C pure d1 + +# use posix format, acls stored +tar --acls -cf acl.tar -C pure d1 + +# Directory names are chosen based on "how the files were extracted from +# archive". Equivalent no* tags are used also: +# ^sacl_ — extracted archive has stored ACLs +# _def_ — target directory (-C) has default ACLs +# _optacl$ — extraction was done with --acls option + +mkdir sacl_def_optacl +mkdir sacl_def_optnoacl +mkdir sacl_nodef_optacl +mkdir sacl_nodef_optnoacl +mkdir nosacl_def_optacl +mkdir nosacl_def_optnoacl +mkdir nosacl_nodef_optacl +mkdir nosacl_nodef_optnoacl + +setfacl -d -m u:$MYNAME:--- nosacl_def_optnoacl sacl_def_optnoacl sacl_def_optacl nosacl_def_optacl +setfacl -d -m g:$MYGROUP:--- nosacl_def_optnoacl sacl_def_optnoacl sacl_def_optacl nosacl_def_optacl + +tar -xf acl.tar -C sacl_nodef_optnoacl +tar --acls -xf acl.tar -C sacl_nodef_optacl +tar -xf acl.tar -C sacl_def_optnoacl +tar --acls -xf acl.tar -C sacl_def_optacl +tar -xf noacl.tar -C nosacl_def_optnoacl +# _NO_ ACLs in output +tar -xf noacl.tar -C nosacl_nodef_optnoacl +tar -xf noacl.tar -C nosacl_nodef_optacl +tar -cf noacl_repackaged.tar -C nosacl_nodef_optnoacl d1 +# _NO_ ACLs in output (even when default ACLs exist) +tar --acls -xf noacl_repackaged.tar -C nosacl_def_optacl + +ACL_LISTDIR(pure) + +ACL_LISTDIR(sacl_def_optacl) +ACL_LISTDIR(sacl_def_optnoacl) +ACL_LISTDIR(sacl_nodef_optacl) +ACL_LISTDIR(sacl_nodef_optnoacl) +ACL_LISTDIR(nosacl_def_optacl) +ACL_LISTDIR(nosacl_def_optnoacl) +ACL_LISTDIR(nosacl_nodef_optacl) +ACL_LISTDIR(nosacl_nodef_optnoacl) + +ACL_ASSERT(pure, sacl_def_optacl, =) + +ACL_ASSERT(sacl_def_optacl, sacl_nodef_optacl, =) +ACL_ASSERT(sacl_def_optnoacl, nosacl_def_optnoacl, =) +ACL_ASSERT(sacl_nodef_optnoacl, nosacl_nodef_optnoacl, =) +ACL_ASSERT(nosacl_def_optacl, nosacl_nodef_optacl, =) +ACL_ASSERT(nosacl_def_optacl, nosacl_nodef_optnoacl, =) + +ACL_ASSERT(sacl_def_optacl, sacl_def_optnoacl, !=) +ACL_ASSERT(sacl_def_optacl, nosacl_def_optnoacl, !=) +ACL_ASSERT(nosacl_def_optnoacl, nosacl_nodef_optnoacl, !=) +], +[0], +[], +[]) + +AT_CLEANUP diff --git a/tests/append.at b/tests/append.at index 8145c9b..10d06d7 100644 --- a/tests/append.at +++ b/tests/append.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/append01.at b/tests/append01.at index 9cb01e5..c899790 100644 --- a/tests/append01.at +++ b/tests/append01.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2005-2007, 2013 Free Software Foundation, Inc. +# Copyright 2005-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/append02.at b/tests/append02.at index 43bbb7e..8030967 100644 --- a/tests/append02.at +++ b/tests/append02.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2006-2007, 2009, 2013 Free Software Foundation, Inc. +# Copyright 2006-2007, 2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/append03.at b/tests/append03.at index 0aa517c..8d0dc78 100644 --- a/tests/append03.at +++ b/tests/append03.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/append04.at b/tests/append04.at index 43b32dd..67a5af8 100644 --- a/tests/append04.at +++ b/tests/append04.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # This file is part of GNU tar. # diff --git a/tests/atlocal.in b/tests/atlocal.in index 2bef145..5fbe6a5 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -1,6 +1,6 @@ # @configure_input@ -*- shell-script -*- # Configurable variable values for tar test suite. -# Copyright 2004, 2006, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/backup01.at b/tests/backup01.at index 9c8502d..1aa33db 100644 --- a/tests/backup01.at +++ b/tests/backup01.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2009-2010, 2013 Free Software Foundation, Inc. +# Copyright 2009-2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/capabs_raw01.at b/tests/capabs_raw01.at index 1b9ac22..82c842a 100644 --- a/tests/capabs_raw01.at +++ b/tests/capabs_raw01.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2012-2013 Free Software Foundation, Inc. +# Copyright 2012-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/chtype.at b/tests/chtype.at index e5b5876..3483998 100644 --- a/tests/chtype.at +++ b/tests/chtype.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/comprec.at b/tests/comprec.at index ea16fa4..c1def2f 100644 --- a/tests/comprec.at +++ b/tests/comprec.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/delete01.at b/tests/delete01.at index f933a42..37acec0 100644 --- a/tests/delete01.at +++ b/tests/delete01.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/delete02.at b/tests/delete02.at index 7b4b911..7bcf8ce 100644 --- a/tests/delete02.at +++ b/tests/delete02.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004-2005, 2007, 2013 Free Software Foundation, Inc. +# Copyright 2004-2005, 2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/delete03.at b/tests/delete03.at index 1feed23..b285382 100644 --- a/tests/delete03.at +++ b/tests/delete03.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/delete04.at b/tests/delete04.at index 593fac8..e3efb9a 100644 --- a/tests/delete04.at +++ b/tests/delete04.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/delete05.at b/tests/delete05.at index fbf24f3..811b9bc 100644 --- a/tests/delete05.at +++ b/tests/delete05.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/exclude.at b/tests/exclude.at index 5e3e060..dbd9245 100644 --- a/tests/exclude.at +++ b/tests/exclude.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2007, 2013 Free Software Foundation, Inc. +# Copyright 2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/exclude01.at b/tests/exclude01.at index b5e7be1..27dd9fe 100644 --- a/tests/exclude01.at +++ b/tests/exclude01.at @@ -1,5 +1,5 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- -# Copyright 2009, 2013 Free Software Foundation, Inc. +# Copyright 2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/exclude02.at b/tests/exclude02.at index 3cd767b..a074221 100644 --- a/tests/exclude02.at +++ b/tests/exclude02.at @@ -1,5 +1,5 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- -# Copyright 2009, 2013 Free Software Foundation, Inc. +# Copyright 2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/exclude03.at b/tests/exclude03.at index 9cf35c9..c247259 100644 --- a/tests/exclude03.at +++ b/tests/exclude03.at @@ -1,5 +1,5 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- -# Copyright 2009, 2013 Free Software Foundation, Inc. +# Copyright 2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/exclude04.at b/tests/exclude04.at index ce566d1..0076426 100644 --- a/tests/exclude04.at +++ b/tests/exclude04.at @@ -1,5 +1,5 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- -# Copyright 2009, 2013 Free Software Foundation, Inc. +# Copyright 2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/exclude05.at b/tests/exclude05.at index 147126b..08d0c7b 100644 --- a/tests/exclude05.at +++ b/tests/exclude05.at @@ -1,5 +1,5 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- -# Copyright 2009-2010, 2013 Free Software Foundation, Inc. +# Copyright 2009-2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/exclude06.at b/tests/exclude06.at index c9155e4..ffea051 100644 --- a/tests/exclude06.at +++ b/tests/exclude06.at @@ -1,5 +1,5 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/exclude07.at b/tests/exclude07.at index 7e90ee4..c3a2c50 100644 --- a/tests/exclude07.at +++ b/tests/exclude07.at @@ -1,5 +1,5 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/exclude08.at b/tests/exclude08.at index aa35270..d35a0b5 100644 --- a/tests/exclude08.at +++ b/tests/exclude08.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/exclude09.at b/tests/exclude09.at index d60bcfe..092d85e 100644 --- a/tests/exclude09.at +++ b/tests/exclude09.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/exclude10.at b/tests/exclude10.at index fadd020..371b866 100644 --- a/tests/exclude10.at +++ b/tests/exclude10.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/exclude11.at b/tests/exclude11.at index ae78743..17144d3 100644 --- a/tests/exclude11.at +++ b/tests/exclude11.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/exclude12.at b/tests/exclude12.at index b5b7824..e9dc0a4 100644 --- a/tests/exclude12.at +++ b/tests/exclude12.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/exclude13.at b/tests/exclude13.at index 34353f4..1946e4e 100644 --- a/tests/exclude13.at +++ b/tests/exclude13.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/exclude14.at b/tests/exclude14.at index 22aac86..53e49f5 100644 --- a/tests/exclude14.at +++ b/tests/exclude14.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/exclude15.at b/tests/exclude15.at index 7c1f6c7..d751c97 100644 --- a/tests/exclude15.at +++ b/tests/exclude15.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/exclude16.at b/tests/exclude16.at index 6f7c894..e009892 100644 --- a/tests/exclude16.at +++ b/tests/exclude16.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/extrac01.at b/tests/extrac01.at index c08177b..970560f 100644 --- a/tests/extrac01.at +++ b/tests/extrac01.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/extrac02.at b/tests/extrac02.at index e8b1253..722f95a 100644 --- a/tests/extrac02.at +++ b/tests/extrac02.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/extrac03.at b/tests/extrac03.at index 069244e..98e8c59 100644 --- a/tests/extrac03.at +++ b/tests/extrac03.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/extrac04.at b/tests/extrac04.at index 0612a61..cd9e114 100644 --- a/tests/extrac04.at +++ b/tests/extrac04.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/extrac05.at b/tests/extrac05.at index 47eb9ca..432d796 100644 --- a/tests/extrac05.at +++ b/tests/extrac05.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/extrac06.at b/tests/extrac06.at index e95051c..b3afb48 100644 --- a/tests/extrac06.at +++ b/tests/extrac06.at @@ -2,7 +2,7 @@ # Test suite for GNU tar. -# Copyright 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/extrac07.at b/tests/extrac07.at index e33bb31..56476dd 100644 --- a/tests/extrac07.at +++ b/tests/extrac07.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/extrac08.at b/tests/extrac08.at index 43df69e..95db1f5 100644 --- a/tests/extrac08.at +++ b/tests/extrac08.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2009, 2013 Free Software Foundation, Inc. +# Copyright 2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/extrac09.at b/tests/extrac09.at index bde656f..b7218ef 100644 --- a/tests/extrac09.at +++ b/tests/extrac09.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. @@ -18,10 +18,20 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# This checks for the --listed-incremental bug reported by J Chapman Flack at -# http://lists.gnu.org/archive/html/bug-tar/2010-06/msg00000.html - -AT_SETUP([no need to save dir with unreadable . and ..]) +# This attempts to cause xgetcwd() to fail, and then checks to see if +# such failure causes tar to abort even in a case where the results of +# the call aren't actually needed. +# +# (xgetcwd() may fail e.g. on Solaris 10 when "." or ".." are unreadable. +# On most systems xgetcwd() won't fail even in that situation, but +# on those systems this test will simply succeed without actually testing +# anything within tar.) +# +# http://lists.gnu.org/archive/html/bug-tar/2010-07/msg00045.html +# +# (See also 'listed03.at'.) + +AT_SETUP([extracting even when . and .. are unreadable]) AT_KEYWORDS([extract extrac09]) AT_TAR_CHECK([ diff --git a/tests/extrac10.at b/tests/extrac10.at index a003477..3efe4ac 100644 --- a/tests/extrac10.at +++ b/tests/extrac10.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/extrac11.at b/tests/extrac11.at index 799b784..5a3f419 100644 --- a/tests/extrac11.at +++ b/tests/extrac11.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/extrac12.at b/tests/extrac12.at index e62763d..0a3a332 100644 --- a/tests/extrac12.at +++ b/tests/extrac12.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/extrac13.at b/tests/extrac13.at index 52ad6c2..ba5b491 100644 --- a/tests/extrac13.at +++ b/tests/extrac13.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/extrac14.at b/tests/extrac14.at index 66bd3fa..65d1ee1 100644 --- a/tests/extrac14.at +++ b/tests/extrac14.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/extrac15.at b/tests/extrac15.at index beaed2a..6eb48b3 100644 --- a/tests/extrac15.at +++ b/tests/extrac15.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/extrac16.at b/tests/extrac16.at index 894f206..49227ef 100644 --- a/tests/extrac16.at +++ b/tests/extrac16.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/extrac17.at b/tests/extrac17.at index 97a156e..4cac47e 100644 --- a/tests/extrac17.at +++ b/tests/extrac17.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/extrac18.at b/tests/extrac18.at index 9170f0e..e76b665 100644 --- a/tests/extrac18.at +++ b/tests/extrac18.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2011, 2013 Free Software Foundation, Inc. +# Copyright 2011, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/extrac19.at b/tests/extrac19.at index b1bb6a5..053d4eb 100644 --- a/tests/extrac19.at +++ b/tests/extrac19.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2011, 2013 Free Software Foundation, Inc. +# Copyright 2011, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/filerem01.at b/tests/filerem01.at index 1c2c519..23c6f8a 100644 --- a/tests/filerem01.at +++ b/tests/filerem01.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2009, 2013 Free Software Foundation, Inc. +# Copyright 2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/filerem02.at b/tests/filerem02.at index 60f5558..bbf2805 100644 --- a/tests/filerem02.at +++ b/tests/filerem02.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2009, 2013 Free Software Foundation, Inc. +# Copyright 2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/grow.at b/tests/grow.at index 92e7cba..5ebf2c6 100644 --- a/tests/grow.at +++ b/tests/grow.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/gzip.at b/tests/gzip.at index f53b5e6..f5c588f 100644 --- a/tests/gzip.at +++ b/tests/gzip.at @@ -1,7 +1,8 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2007, 2009-2010, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2007, 2009-2010, 2013-2014 Free Software Foundation, +# Inc. # This file is part of GNU tar. diff --git a/tests/ignfail.at b/tests/ignfail.at index 3f4ea56..fec64d9 100644 --- a/tests/ignfail.at +++ b/tests/ignfail.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/incr01.at b/tests/incr01.at index 0b14908..40892f9 100644 --- a/tests/incr01.at +++ b/tests/incr01.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2005, 2007, 2013 Free Software Foundation, Inc. +# Copyright 2005, 2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/incr02.at b/tests/incr02.at index 5f45215..3b413e9 100644 --- a/tests/incr02.at +++ b/tests/incr02.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2005, 2007, 2013 Free Software Foundation, Inc. +# Copyright 2005, 2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/incr03.at b/tests/incr03.at index 5f7772c..59c5332 100644 --- a/tests/incr03.at +++ b/tests/incr03.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2006-2007, 2009, 2013 Free Software Foundation, Inc. +# Copyright 2006-2007, 2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/incr04.at b/tests/incr04.at index 0638e1b..2d29f87 100644 --- a/tests/incr04.at +++ b/tests/incr04.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2006-2007, 2009, 2013 Free Software Foundation, Inc. +# Copyright 2006-2007, 2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/incr05.at b/tests/incr05.at index 96853db..8537243 100644 --- a/tests/incr05.at +++ b/tests/incr05.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2009, 2013 Free Software Foundation, Inc. +# Copyright 2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/incr06.at b/tests/incr06.at index 71d9043..931ec52 100644 --- a/tests/incr06.at +++ b/tests/incr06.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2009, 2013 Free Software Foundation, Inc. +# Copyright 2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/incr07.at b/tests/incr07.at index 017c51d..cbd4a3d 100644 --- a/tests/incr07.at +++ b/tests/incr07.at @@ -1,6 +1,6 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2009, 2013 Free Software Foundation, Inc. +# Copyright 2009, 2013-2014 Free Software Foundation, Inc. # # GNU tar is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -38,23 +38,23 @@ AT_KEYWORDS([incremental extract incr07]) # http://lists.gnu.org/archive/html/bug-tar/2013-03/msg00044.html AT_TAR_CHECK([ -mkdir A -echo 'a' > A/a -echo 'a' > A/b +mkdir dirA +echo 'a' > dirA/a +echo 'a' > dirA/b decho C0 -tar -g test.snar -vcf test.0.tar A +tar -g test.snar -vcf test.0.tar dirA -echo 'a' > A/c +echo 'a' > dirA/c decho C1 -tar -g test.snar -vcf test.1.tar A +tar -g test.snar -vcf test.1.tar dirA -rm -f A/a +rm -f dirA/a decho C2 -tar -g test.snar -vcf test.2.tar A +tar -g test.snar -vcf test.2.tar dirA mkdir ext -rm -rf A +rm -rf dirA decho E0 tar -g test.snar -vxf test.0.tar -C ext/ @@ -64,43 +64,43 @@ tar -g test.snar -vxf test.1.tar -C ext/ decho E2 tar -g test.snar -vxf test.2.tar -C ext/ -mkdir ext/A/B -touch ext/A/B/file +mkdir ext/dirA/dirB +touch ext/dirA/dirB/file decho E3 tar -g test.snar -vxf test.2.tar -C ext/ echo FIN -test -d A && echo >&2 "toplevel A exists" +test -d dirA && echo >&2 "toplevel dirA exists" exit 0 ], [0], [C0 -A/ -A/a -A/b +dirA/ +dirA/a +dirA/b C1 -A/ -A/c +dirA/ +dirA/c C2 -A/ +dirA/ E0 -A/ -A/a -A/b +dirA/ +dirA/a +dirA/b E1 -A/ -A/c +dirA/ +dirA/c E2 -A/ -tar: Deleting 'A/a' +dirA/ +tar: Deleting 'dirA/a' E3 -A/ -tar: Deleting 'A/B' +dirA/ +tar: Deleting 'dirA/dirB' FIN ], [C0 -tar: A: Directory is new +tar: dirA: Directory is new C1 C2 E0 diff --git a/tests/incr08.at b/tests/incr08.at index 863581c..b67fe1d 100644 --- a/tests/incr08.at +++ b/tests/incr08.at @@ -1,6 +1,6 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # GNU tar is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/incr09.at b/tests/incr09.at index e91fb5a..efe6538 100644 --- a/tests/incr09.at +++ b/tests/incr09.at @@ -1,6 +1,6 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # GNU tar is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/incremental.at b/tests/incremental.at index 19e376b..60c82ba 100644 --- a/tests/incremental.at +++ b/tests/incremental.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/indexfile.at b/tests/indexfile.at index 07fc4dc..df3e830 100644 --- a/tests/indexfile.at +++ b/tests/indexfile.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/iotty.at b/tests/iotty.at new file mode 100644 index 0000000..7cbb178 --- /dev/null +++ b/tests/iotty.at @@ -0,0 +1,53 @@ +# Process this file with autom4te to create testsuite. -*- Autotest -*- + +# Test suite for GNU tar. +# Copyright 2014 Free Software Foundation, Inc. + +# This file is part of GNU tar. + +# GNU tar is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# GNU tar is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Description: Tar should refuse to read archive from the terminal. +# Reported by: Pavel Raiskup +# References: <5285498.uPPgZ77uHP@nb.usersys.redhat.com>, +# http://lists.gnu.org/archive/html/bug-tar/2014-03/msg00033.html + +AT_SETUP([terminal input]) +AT_KEYWORDS([options iotty]) + +AT_TAR_CHECK([ +test -x $abs_builddir/ttyemu || AT_SKIP_TEST +TAPE=- +export TAPE +ttyemu -t5 -i/dev/null tar -x +echo $? +ttyemu -t5 -i/dev/null tar -xz +echo $? +ttyemu -t5 -i/dev/null tar -c . +echo $? +], +[0], +[tar: Refusing to read archive contents from terminal (missing -f option?) +tar: Error is not recoverable: exiting now +2 +tar: Refusing to read archive contents from terminal (missing -f option?) +tar: Error is not recoverable: exiting now +2 +tar: Refusing to write archive contents to terminal (missing -f option?) +tar: Error is not recoverable: exiting now +2 +], +[],[],[],[posix, gnu, oldgnu]) + +AT_CLEANUP diff --git a/tests/label01.at b/tests/label01.at index e2519b0..8b6f393 100644 --- a/tests/label01.at +++ b/tests/label01.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/label02.at b/tests/label02.at index f737e02..524686c 100644 --- a/tests/label02.at +++ b/tests/label02.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/label03.at b/tests/label03.at index d7d09e5..3c7d154 100644 --- a/tests/label03.at +++ b/tests/label03.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/label04.at b/tests/label04.at index 758a4d3..677614f 100644 --- a/tests/label04.at +++ b/tests/label04.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/label05.at b/tests/label05.at index c77a1aa..f8a9b6d 100644 --- a/tests/label05.at +++ b/tests/label05.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/link01.at b/tests/link01.at index dfafec0..b11ed32 100644 --- a/tests/link01.at +++ b/tests/link01.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2007, 2009, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2007, 2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/link02.at b/tests/link02.at index 91657fd..8be2fa8 100644 --- a/tests/link02.at +++ b/tests/link02.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2009, 2013 Free Software Foundation, Inc. +# Copyright 2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/link03.at b/tests/link03.at index 0d87ccd..ca85201 100644 --- a/tests/link03.at +++ b/tests/link03.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2009, 2013 Free Software Foundation, Inc. +# Copyright 2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/link04.at b/tests/link04.at index 92c8bf9..03697bd 100644 --- a/tests/link04.at +++ b/tests/link04.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/listed01.at b/tests/listed01.at index 94aed56..eff2bdc 100644 --- a/tests/listed01.at +++ b/tests/listed01.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004-2007, 2009, 2013 Free Software Foundation, Inc. +# Copyright 2004-2007, 2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/listed02.at b/tests/listed02.at index 272d843..2fb77fd 100644 --- a/tests/listed02.at +++ b/tests/listed02.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004-2007, 2009, 2013 Free Software Foundation, Inc. +# Copyright 2004-2007, 2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/listed03.at b/tests/listed03.at index bf66801..c2cf52f 100644 --- a/tests/listed03.at +++ b/tests/listed03.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/listed04.at b/tests/listed04.at index 38f33dc..a5513aa 100644 --- a/tests/listed04.at +++ b/tests/listed04.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/listed05.at b/tests/listed05.at index c7b3c26..42f3c63 100644 --- a/tests/listed05.at +++ b/tests/listed05.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/long01.at b/tests/long01.at index fdab203..42d65b7 100644 --- a/tests/long01.at +++ b/tests/long01.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2005-2007, 2013 Free Software Foundation, Inc. +# Copyright 2005-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/longv7.at b/tests/longv7.at index ed3cc21..603a7ec 100644 --- a/tests/longv7.at +++ b/tests/longv7.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/lustar01.at b/tests/lustar01.at index c3163c9..3c0d219 100644 --- a/tests/lustar01.at +++ b/tests/lustar01.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/lustar02.at b/tests/lustar02.at index 0156142..cf2660b 100644 --- a/tests/lustar02.at +++ b/tests/lustar02.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/lustar03.at b/tests/lustar03.at index 055f0f4..913ae11 100644 --- a/tests/lustar03.at +++ b/tests/lustar03.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/multiv01.at b/tests/multiv01.at index 09e2ff3..a5dedf6 100644 --- a/tests/multiv01.at +++ b/tests/multiv01.at @@ -1,7 +1,8 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2009, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2009, 2013-2014 Free Software Foundation, +# Inc. # This file is part of GNU tar. diff --git a/tests/multiv02.at b/tests/multiv02.at index 6f77e55..010b72d 100644 --- a/tests/multiv02.at +++ b/tests/multiv02.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/multiv03.at b/tests/multiv03.at index 786fff3..b552c4e 100644 --- a/tests/multiv03.at +++ b/tests/multiv03.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/multiv04.at b/tests/multiv04.at index e781d85..7d2c1fe 100644 --- a/tests/multiv04.at +++ b/tests/multiv04.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2005-2007, 2013 Free Software Foundation, Inc. +# Copyright 2005-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/multiv05.at b/tests/multiv05.at index 33422f4..862ec0e 100644 --- a/tests/multiv05.at +++ b/tests/multiv05.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2006-2008, 2013 Free Software Foundation, Inc. +# Copyright 2006-2008, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/multiv06.at b/tests/multiv06.at index 5852499..739c87e 100644 --- a/tests/multiv06.at +++ b/tests/multiv06.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2008, 2013 Free Software Foundation, Inc. +# Copyright 2008, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/multiv07.at b/tests/multiv07.at index d41eb93..9ea9ea8 100644 --- a/tests/multiv07.at +++ b/tests/multiv07.at @@ -1,5 +1,5 @@ # Test suite for GNU tar. -*- Autotest -*- -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/multiv08.at b/tests/multiv08.at index e6a3bfd..f8cadea 100644 --- a/tests/multiv08.at +++ b/tests/multiv08.at @@ -1,5 +1,5 @@ # Test suite for GNU tar. -*- Autotest -*- -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/old.at b/tests/old.at index bbf275a..e033b56 100644 --- a/tests/old.at +++ b/tests/old.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/onetop01.at b/tests/onetop01.at new file mode 100644 index 0000000..a970a99 --- /dev/null +++ b/tests/onetop01.at @@ -0,0 +1,42 @@ +# Process this file with autom4te to create testsuite. -*- Autotest -*- +# +# Test suite for GNU tar. +# Copyright 2014 Free Software Foundation, Inc. +# +# This file is part of GNU tar. +# +# GNU tar is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# GNU tar is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +AT_SETUP([tar --one-top-level]) +AT_KEYWORDS([extract onetop onetop01]) + +AT_TAR_CHECK([ +AT_SORT_PREREQ +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level -x -f ../a.tar +find . | sort +], +[0], +[. +./a +./a/b +./a/c +]) + +AT_CLEANUP diff --git a/tests/onetop02.at b/tests/onetop02.at new file mode 100644 index 0000000..454f692 --- /dev/null +++ b/tests/onetop02.at @@ -0,0 +1,45 @@ +# Process this file with autom4te to create testsuite. -*- Autotest -*- +# +# Test suite for GNU tar. +# Copyright 2014 Free Software Foundation, Inc. +# +# This file is part of GNU tar. +# +# GNU tar is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# GNU tar is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +AT_SETUP([tar --one-top-level --show-transformed]) +AT_KEYWORDS([extract onetop onetop02]) + +AT_TAR_CHECK([ +AT_SORT_PREREQ +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level --show-transformed -v -x -f ../a.tar +find . | sort +], +[0], +[a/ +a/b +a/c +. +./a +./a/b +./a/c +]) + +AT_CLEANUP diff --git a/tests/onetop03.at b/tests/onetop03.at new file mode 100644 index 0000000..3ffc71d --- /dev/null +++ b/tests/onetop03.at @@ -0,0 +1,42 @@ +# Process this file with autom4te to create testsuite. -*- Autotest -*- +# +# Test suite for GNU tar. +# Copyright 2014 Free Software Foundation, Inc. +# +# This file is part of GNU tar. +# +# GNU tar is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# GNU tar is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +AT_SETUP([tar --one-top-level --transform]) +AT_KEYWORDS([extract onetop onetop02]) + +AT_TAR_CHECK([ +AT_SORT_PREREQ +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level --transform 's/c/d/' -x -f ../a.tar +find . | sort +], +[0], +[. +./a +./a/b +./a/d +]) + +AT_CLEANUP diff --git a/tests/onetop04.at b/tests/onetop04.at new file mode 100644 index 0000000..37fba19 --- /dev/null +++ b/tests/onetop04.at @@ -0,0 +1,38 @@ +# Process this file with autom4te to create testsuite. -*- Autotest -*- +# +# Test suite for GNU tar. +# Copyright 2014 Free Software Foundation, Inc. +# +# This file is part of GNU tar. +# +# GNU tar is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# GNU tar is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +AT_SETUP([tar --one-top-level --transform]) +AT_KEYWORDS([extract onetop onetop02]) + +AT_TAR_CHECK([ +AT_SORT_PREREQ +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +tar -tf a.tar --one-top-level --transform 's/c/d/' --show-transformed | sort +], +[0], +[a/ +a/b +a/d +]) + +AT_CLEANUP diff --git a/tests/opcomp01.at b/tests/opcomp01.at index f696be8..bcd96d3 100644 --- a/tests/opcomp01.at +++ b/tests/opcomp01.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. @@ -26,7 +26,7 @@ tar --occurrence=1 -cf test.tar . ], [2], [], -[tar: --occurrence cannot be used with -c +[tar: '--occurrence' cannot be used with '-c' Try 'tar --help' or 'tar --usage' for more information. ]) diff --git a/tests/opcomp02.at b/tests/opcomp02.at index 85538c8..1a36b13 100644 --- a/tests/opcomp02.at +++ b/tests/opcomp02.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/opcomp03.at b/tests/opcomp03.at index aa54053..20ace58 100644 --- a/tests/opcomp03.at +++ b/tests/opcomp03.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. @@ -26,7 +26,7 @@ tar -tWf test.tar . ], [2], [], -[tar: --verify cannot be used with -t +[tar: '--verify' cannot be used with '-t' Try 'tar --help' or 'tar --usage' for more information. ]) diff --git a/tests/opcomp04.at b/tests/opcomp04.at index 67f94b5..2f9eb04 100644 --- a/tests/opcomp04.at +++ b/tests/opcomp04.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/opcomp05.at b/tests/opcomp05.at index f470d4c..adcdc67 100644 --- a/tests/opcomp05.at +++ b/tests/opcomp05.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/opcomp06.at b/tests/opcomp06.at index 12de5b2..3ac6610 100644 --- a/tests/opcomp06.at +++ b/tests/opcomp06.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/options.at b/tests/options.at index 891fd6e..32b50bd 100644 --- a/tests/options.at +++ b/tests/options.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/options02.at b/tests/options02.at index aa27d2d..c8dfdbd 100644 --- a/tests/options02.at +++ b/tests/options02.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/owner.at b/tests/owner.at index cfa155e..9c04223 100644 --- a/tests/owner.at +++ b/tests/owner.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2011, 2013 Free Software Foundation, Inc. +# Copyright 2011, 2013-2014 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/package.m4 b/tests/package.m4 index 564cea6..3ec0591 100644 --- a/tests/package.m4 +++ b/tests/package.m4 @@ -1,6 +1,6 @@ # Signature of the current package. m4_define([AT_PACKAGE_NAME], [GNU tar]) m4_define([AT_PACKAGE_TARNAME], [tar]) -m4_define([AT_PACKAGE_VERSION], [1.27]) -m4_define([AT_PACKAGE_STRING], [GNU tar 1.27]) +m4_define([AT_PACKAGE_VERSION], [1.28]) +m4_define([AT_PACKAGE_STRING], [GNU tar 1.28]) m4_define([AT_PACKAGE_BUGREPORT], [bug-tar@gnu.org]) diff --git a/tests/pipe.at b/tests/pipe.at index 964c9e9..2cfa5f5 100644 --- a/tests/pipe.at +++ b/tests/pipe.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004-2009, 2013 Free Software Foundation, Inc. +# Copyright 2004-2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/recurs02.at b/tests/recurs02.at new file mode 100644 index 0000000..93aa2c1 --- /dev/null +++ b/tests/recurs02.at @@ -0,0 +1,47 @@ +# Process this file with autom4te to create testsuite. -*- Autotest -*- + +# Test suite for GNU tar. +# Copyright 2014 Free Software Foundation, Inc. + +# This file is part of GNU tar. + +# GNU tar is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# GNU tar is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Description: Test interaction of --recursion and --no-recursion options. +# Each of them remains in effect until cancelled by the next ocurrence +# of its counterpart. This didn't work in v.1.27.1 and was fixed by +# commit 2bd9c153. +# Reported by: Kai +# References: <1389166145.829001090@f341.i.mail.ru>, +# <20140108231826.16453@ulysses.gnu.org.ua>, +# https://lists.gnu.org/archive/html/bug-tar/2014-01/msg00019.html + +AT_SETUP([recurse: toggle]) +AT_KEYWORDS([recurse options recurse02]) + +AT_TAR_CHECK([ +mkdir directory1 directory2 +touch directory1/file directory2/file +tar --create --file archive \ + --no-recursion directory1 \ + --recursion directory2 || exit 1 +tar tf archive +], +[0], +[directory1/ +directory2/ +directory2/file +]) + +AT_CLEANUP diff --git a/tests/recurse.at b/tests/recurse.at index 1b5f2dd..c79e795 100644 --- a/tests/recurse.at +++ b/tests/recurse.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/remfiles01.at b/tests/remfiles01.at index 948903a..39adcaa 100644 --- a/tests/remfiles01.at +++ b/tests/remfiles01.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2009, 2013 Free Software Foundation, Inc. +# Copyright 2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/remfiles02.at b/tests/remfiles02.at index b66ec28..c77afed 100644 --- a/tests/remfiles02.at +++ b/tests/remfiles02.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2009, 2013 Free Software Foundation, Inc. +# Copyright 2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/remfiles03.at b/tests/remfiles03.at index d5d9741..bc3f379 100644 --- a/tests/remfiles03.at +++ b/tests/remfiles03.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2009, 2013 Free Software Foundation, Inc. +# Copyright 2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/remfiles04a.at b/tests/remfiles04a.at index d1e4614..ace78e8 100644 --- a/tests/remfiles04a.at +++ b/tests/remfiles04a.at @@ -1,6 +1,6 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # GNU tar is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/remfiles04b.at b/tests/remfiles04b.at index 3208557..27273a6 100644 --- a/tests/remfiles04b.at +++ b/tests/remfiles04b.at @@ -1,6 +1,6 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # GNU tar is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/remfiles04c.at b/tests/remfiles04c.at index a1b6d56..bf426c6 100644 --- a/tests/remfiles04c.at +++ b/tests/remfiles04c.at @@ -1,6 +1,6 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # GNU tar is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/remfiles05a.at b/tests/remfiles05a.at index 4ceec37..cc3680b 100644 --- a/tests/remfiles05a.at +++ b/tests/remfiles05a.at @@ -1,6 +1,6 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # GNU tar is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/remfiles05b.at b/tests/remfiles05b.at index d120efd..f429451 100644 --- a/tests/remfiles05b.at +++ b/tests/remfiles05b.at @@ -1,6 +1,6 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # GNU tar is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/remfiles05c.at b/tests/remfiles05c.at index a01b092..c1a4638 100644 --- a/tests/remfiles05c.at +++ b/tests/remfiles05c.at @@ -1,6 +1,6 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # GNU tar is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/remfiles06a.at b/tests/remfiles06a.at index fe762c1..798c7c3 100644 --- a/tests/remfiles06a.at +++ b/tests/remfiles06a.at @@ -1,6 +1,6 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # GNU tar is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/remfiles06b.at b/tests/remfiles06b.at index 3b867fb..2626f2e 100644 --- a/tests/remfiles06b.at +++ b/tests/remfiles06b.at @@ -1,6 +1,6 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # GNU tar is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/remfiles06c.at b/tests/remfiles06c.at index ad9164d..78a70e4 100644 --- a/tests/remfiles06c.at +++ b/tests/remfiles06c.at @@ -1,6 +1,6 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # GNU tar 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 @@ tar -cf foo.tar -C foo file -C $DIR/bar file decho A find . | sort decho B -tar -rvf foo.tar --remove-files -C foo file -C ../bar file +tar -rvf foo.tar --remove-files -C foo file -C $DIR/bar file decho C find . | sort ], diff --git a/tests/remfiles07a.at b/tests/remfiles07a.at index 95f645c..f3131f7 100644 --- a/tests/remfiles07a.at +++ b/tests/remfiles07a.at @@ -1,6 +1,6 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # GNU tar is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,11 +18,11 @@ # Description: ensure tar correctly respects -C option when deleting # files due to the --remove-files option. # -# This case checks the use of a relative -C option followed by an absolute -C, +# This case checks the use of an absolute -C option followed by a relative -C, # in --create/non-incremental mode. # -AT_SETUP([remove-files with -C:rel,abs in -c/non-incr. mode]) +AT_SETUP([remove-files with -C:abs,rel in -c/non-incr. mode]) AT_KEYWORDS([create remove-files remfiles07 remfiles07a]) AT_TAR_CHECK([ @@ -34,7 +34,7 @@ echo foo/file > foo/file echo bar/file > bar/file DIR=`pwd` decho A -tar -cvf foo.tar --remove-files -C foo file -C $DIR/bar file +tar -cvf foo.tar --remove-files -C $DIR/foo file -C ../bar file decho B find . | sort ], diff --git a/tests/remfiles07b.at b/tests/remfiles07b.at index ca67e5d..c5db0d5 100644 --- a/tests/remfiles07b.at +++ b/tests/remfiles07b.at @@ -1,6 +1,6 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # GNU tar is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,11 +18,11 @@ # Description: ensure tar correctly respects -C option when deleting # files due to the --remove-files option. # -# This case checks the use of a relative -C option followed by an absolute -C, +# This case checks the use of an absolute -C option followed by a relative -C, # in --create/incremental mode. # -AT_SETUP([remove-files with -C:rel,abs in -c/incr. mode]) +AT_SETUP([remove-files with -C:abs,rel in -c/incr. mode]) AT_KEYWORDS([create incremental remove-files remfiles07 remfiles07b]) AT_TAR_CHECK([ @@ -34,7 +34,7 @@ echo foo/file > foo/file echo bar/file > bar/file DIR=`pwd` decho A -tar -cvf foo.tar --incremental --remove-files -C foo file -C $DIR/bar file +tar -cvf foo.tar --incremental --remove-files -C $DIR/foo file -C ../bar file decho B find . | sort ], diff --git a/tests/remfiles07c.at b/tests/remfiles07c.at index 6a5c870..9b4139a 100644 --- a/tests/remfiles07c.at +++ b/tests/remfiles07c.at @@ -1,6 +1,6 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # GNU tar is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,11 +18,11 @@ # Description: ensure tar correctly respects -C option when deleting # files due to the --remove-files option. # -# This case checks the use of a relative -C option followed by an absolute -C, +# This case checks the use of an absolute -C option followed by a relative -C, # in --append mode. # -AT_SETUP([remove-files with -C:rel,abs in -r mode]) +AT_SETUP([remove-files with -C:abs,rel in -r mode]) AT_KEYWORDS([create append remove-files remfiles07 remfiles07c]) AT_TAR_CHECK([ @@ -33,11 +33,11 @@ echo file > file echo foo/file > foo/file echo bar/file > bar/file DIR=`pwd` -tar -cf foo.tar -C foo file -C $DIR/bar file +tar -cf foo.tar -C $DIR/foo file -C ../bar file decho A find . | sort decho B -tar -rvf foo.tar --remove-files -C foo file -C $DIR/bar file +tar -rvf foo.tar --remove-files -C $DIR/foo file -C ../bar file decho C find . | sort ], diff --git a/tests/remfiles08a.at b/tests/remfiles08a.at index eadf149..8db9f71 100644 --- a/tests/remfiles08a.at +++ b/tests/remfiles08a.at @@ -1,6 +1,6 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # GNU tar is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,38 +15,37 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Description: ensure tar correctly respects -C option when deleting -# files due to the --remove-files option. +# Description: If tar 1.26 was called with the --remove-files option and told +# to archive (and thus delete) two subdirectories where the second was +# specified relative to the first, it would be unable to delete the +# second directory (and its contents), since the relative path would no +# longer be valid once the first directory was deleted. # -# This case checks the use of an absolute -C option followed by a relative -C, +# This case checks for successful deletion of all archived items # in --create/non-incremental mode. # -AT_SETUP([remove-files with -C:abs,rel in -c/non-incr. mode]) +AT_SETUP([remove-files deleting two subdirs in -c/non-incr. mode]) AT_KEYWORDS([create remove-files remfiles08 remfiles08a]) AT_TAR_CHECK([ -AT_SORT_PREREQ mkdir foo mkdir bar -echo file > file -echo foo/file > foo/file -echo bar/file > bar/file -DIR=`pwd` +echo foo/foo_file > foo/foo_file +echo bar/bar_file > bar/bar_file decho A -tar -cvf foo.tar --remove-files -C $DIR/foo file -C ../bar file +tar -cvf foo.tar --remove-files -C foo . -C ../bar . decho B -find . | sort +find . ], [0], [A -file -file +./ +./foo_file +./ +./bar_file B . -./bar -./file -./foo ./foo.tar ], [A diff --git a/tests/remfiles08b.at b/tests/remfiles08b.at index 9faf2bb..13beaf4 100644 --- a/tests/remfiles08b.at +++ b/tests/remfiles08b.at @@ -1,6 +1,6 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # GNU tar is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,41 +15,47 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Description: ensure tar correctly respects -C option when deleting -# files due to the --remove-files option. +# Description: If tar 1.26 was called with the --remove-files option and told +# to archive (and thus delete) two subdirectories where the second was +# specified relative to the first, it would be unable to delete the +# second directory (and its contents), since the relative path would no +# longer be valid once the first directory was deleted. # -# This case checks the use of an absolute -C option followed by a relative -C, +# This case checks for successful deletion of all archived items # in --create/incremental mode. # +# Note: tar 1.27 fails this test case due to a more general issue +# archving-and-removing a full directory tree when run in incremental +# mode; see remfiles09b.at for that specific test case. -AT_SETUP([remove-files with -C:abs,rel in -c/incr. mode]) +AT_SETUP([remove-files deleting two subdirs in -c/incr. mode]) AT_KEYWORDS([create incremental remove-files remfiles08 remfiles08b]) +AT_XFAIL_IF(true) # we expect to fail in tar 1.27 + AT_TAR_CHECK([ -AT_SORT_PREREQ mkdir foo mkdir bar -echo file > file -echo foo/file > foo/file -echo bar/file > bar/file -DIR=`pwd` +echo foo/foo_file > foo/foo_file +echo bar/bar_file > bar/bar_file decho A -tar -cvf foo.tar --incremental --remove-files -C $DIR/foo file -C ../bar file +tar -cvf foo.tar --incremental --remove-files -C foo . -C ../bar . decho B -find . | sort +find . ], [0], [A -file -file +./ +./ +./foo_file +./bar_file B . -./bar -./file -./foo ./foo.tar ], [A +tar: .: Directory is new +tar: .: Directory is new B ],[],[],[gnu]) diff --git a/tests/remfiles08c.at b/tests/remfiles08c.at index a220f4c..b52b032 100644 --- a/tests/remfiles08c.at +++ b/tests/remfiles08c.at @@ -1,6 +1,6 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # GNU tar is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -15,49 +15,48 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Description: ensure tar correctly respects -C option when deleting -# files due to the --remove-files option. +# Description: If tar 1.26 was called with the --remove-files option and told +# to archive (and thus delete) two subdirectories where the second was +# specified relative to the first, it would be unable to delete the +# second directory (and its contents), since the relative path would no +# longer be valid once the first directory was deleted. # -# This case checks the use of an absolute -C option followed by a relative -C, +# This case checks for successful deletion of all archived items # in --append mode. # -AT_SETUP([remove-files with -C:abs,rel in -r mode]) +AT_SETUP([remove-files deleting two subdirs in -r mode]) AT_KEYWORDS([create append remove-files remfiles08 remfiles08c]) AT_TAR_CHECK([ AT_SORT_PREREQ mkdir foo mkdir bar -echo file > file -echo foo/file > foo/file -echo bar/file > bar/file -DIR=`pwd` -tar -cf foo.tar -C $DIR/foo file -C ../bar file +echo foo/foo_file > foo/foo_file +echo bar/bar_file > bar/bar_file +tar -cf foo.tar -C foo . -C ../bar . decho A find . | sort decho B -tar -rvf foo.tar --remove-files -C $DIR/foo file -C ../bar file +tar -rvf foo.tar --remove-files -C foo . -C ../bar . decho C -find . | sort +find . ], [0], [A . ./bar -./bar/file -./file +./bar/bar_file ./foo ./foo.tar -./foo/file +./foo/foo_file B -file -file +./ +./foo_file +./ +./bar_file C . -./bar -./file -./foo ./foo.tar ], [A diff --git a/tests/remfiles09a.at b/tests/remfiles09a.at index fd28b4f..5f96737 100644 --- a/tests/remfiles09a.at +++ b/tests/remfiles09a.at @@ -1,6 +1,6 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # GNU tar 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 @@ echo foo/file > foo/file decho A tar -cvf foo.tar --remove-files foo decho B -find . +find . ], [0], [A diff --git a/tests/remfiles09b.at b/tests/remfiles09b.at index de9b172..45b8440 100644 --- a/tests/remfiles09b.at +++ b/tests/remfiles09b.at @@ -1,6 +1,6 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # GNU tar 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,10 @@ AT_KEYWORDS([create incremental remove-files remfiles09 remfiles09b]) AT_XFAIL_IF(true) # we expect to fail in tar 1.27 AT_TAR_CHECK([ -AT_SORT_PREREQ mkdir foo echo foo/file > foo/file decho A tar -cvf foo.tar --incremental --remove-files foo -TARSTAT=$? decho B find . ], @@ -47,7 +45,6 @@ foo/ foo/file B . -./foo ./foo.tar ], [A diff --git a/tests/remfiles09c.at b/tests/remfiles09c.at index 7241608..7d7d967 100644 --- a/tests/remfiles09c.at +++ b/tests/remfiles09c.at @@ -1,6 +1,6 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2013 Free Software Foundation, Inc. +# Copyright 2013-2014 Free Software Foundation, Inc. # # GNU tar is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/remfiles10.at b/tests/remfiles10.at new file mode 100644 index 0000000..b4fe139 --- /dev/null +++ b/tests/remfiles10.at @@ -0,0 +1,46 @@ +# Process this file with autom4te to create testsuite. -*- Autotest -*- +# Test suite for GNU tar. +# Copyright 2014 Free Software Foundation, Inc. +# +# GNU tar is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# GNU tar is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# Check --remove-files with . + +AT_SETUP([remove-files]) +AT_KEYWORDS([create remove-files remfiles10]) + +AT_TAR_CHECK([ +mkdir foo +echo foo/file > foo/file +decho A +(cd foo && tar -cvf ../foo.tar --remove-files .) +tar_status=$? +decho B +find foo +exit $tar_status +], +[2], +[A +./ +./file +B +foo +], +[A +tar: .: Cannot rmdir: Invalid argument +tar: Exiting with failure status due to previous errors +B +],[],[],[gnu]) + +AT_CLEANUP diff --git a/tests/rename01.at b/tests/rename01.at index 030b0b7..e6990fe 100644 --- a/tests/rename01.at +++ b/tests/rename01.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2006-2007, 2009, 2013 Free Software Foundation, Inc. +# Copyright 2006-2007, 2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/rename02.at b/tests/rename02.at index d1f136d..8de3123 100644 --- a/tests/rename02.at +++ b/tests/rename02.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2006-2007, 2009, 2013 Free Software Foundation, Inc. +# Copyright 2006-2007, 2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/rename03.at b/tests/rename03.at index bd4291b..fdfff3a 100644 --- a/tests/rename03.at +++ b/tests/rename03.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2006-2007, 2009, 2013 Free Software Foundation, Inc. +# Copyright 2006-2007, 2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/rename04.at b/tests/rename04.at index b5815d5..c6319ea 100644 --- a/tests/rename04.at +++ b/tests/rename04.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2008, 2013 Free Software Foundation, Inc. +# Copyright 2008, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/rename05.at b/tests/rename05.at index 64654b6..417ac28 100644 --- a/tests/rename05.at +++ b/tests/rename05.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2008, 2013 Free Software Foundation, Inc. +# Copyright 2008, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/same-order01.at b/tests/same-order01.at index 6194e2e..fab9c3e 100644 --- a/tests/same-order01.at +++ b/tests/same-order01.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/same-order02.at b/tests/same-order02.at index d37cf7f..56dd71b 100644 --- a/tests/same-order02.at +++ b/tests/same-order02.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/selacl01.at b/tests/selacl01.at index 6c1dcf3..b90794d 100644 --- a/tests/selacl01.at +++ b/tests/selacl01.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2011, 2013 Free Software Foundation, Inc. +# Copyright 2011, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/selnx01.at b/tests/selnx01.at index fc96b36..48b45d9 100644 --- a/tests/selnx01.at +++ b/tests/selnx01.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2012-2013 Free Software Foundation, Inc. +# Copyright 2012-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/shortfile.at b/tests/shortfile.at index 9f5c3a4..2a9fdf6 100644 --- a/tests/shortfile.at +++ b/tests/shortfile.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2007, 2013 Free Software Foundation, Inc. +# Copyright 2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/shortrec.at b/tests/shortrec.at index 177221e..13e46d3 100644 --- a/tests/shortrec.at +++ b/tests/shortrec.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2005, 2007-2009, 2013 Free Software Foundation, Inc. +# Copyright 2005, 2007-2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/shortupd.at b/tests/shortupd.at index f9f3680..1a43e41 100644 --- a/tests/shortupd.at +++ b/tests/shortupd.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2007, 2013 Free Software Foundation, Inc. +# Copyright 2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/sigpipe.at b/tests/sigpipe.at index 46afc64..4b27ef1 100644 --- a/tests/sigpipe.at +++ b/tests/sigpipe.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/sparse01.at b/tests/sparse01.at index 7d75be0..ccd54da 100644 --- a/tests/sparse01.at +++ b/tests/sparse01.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/sparse02.at b/tests/sparse02.at index 042cec9..1f04491 100644 --- a/tests/sparse02.at +++ b/tests/sparse02.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/sparse03.at b/tests/sparse03.at index 91fd87c..3521eab 100644 --- a/tests/sparse03.at +++ b/tests/sparse03.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2005-2007, 2013 Free Software Foundation, Inc. +# Copyright 2005-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/sparse04.at b/tests/sparse04.at index 2cfae79..c6e9cd3 100644 --- a/tests/sparse04.at +++ b/tests/sparse04.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/sparsemv.at b/tests/sparsemv.at index c43a099..958f04e 100644 --- a/tests/sparsemv.at +++ b/tests/sparsemv.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2005-2008, 2013 Free Software Foundation, Inc. +# Copyright 2005-2008, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/sparsemvp.at b/tests/sparsemvp.at index 05073dd..29ee224 100644 --- a/tests/sparsemvp.at +++ b/tests/sparsemvp.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2005-2009, 2013 Free Software Foundation, Inc. +# Copyright 2005-2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/spmvp00.at b/tests/spmvp00.at index a601c58..30a0585 100644 --- a/tests/spmvp00.at +++ b/tests/spmvp00.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/spmvp01.at b/tests/spmvp01.at index 4293a86..a6788c8 100644 --- a/tests/spmvp01.at +++ b/tests/spmvp01.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/spmvp10.at b/tests/spmvp10.at index c5d287d..4adf10b 100644 --- a/tests/spmvp10.at +++ b/tests/spmvp10.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/star/README b/tests/star/README index c570270..fc47673 100644 --- a/tests/star/README +++ b/tests/star/README @@ -67,7 +67,7 @@ the example below: * Copying -Copyright 2004, 2006-2008, 2010, 2012-2013 Free Software Foundation, +Copyright 2004, 2006-2008, 2010, 2012-2014 Free Software Foundation, Inc. This file is part of GNU tar. diff --git a/tests/star/gtarfail.at b/tests/star/gtarfail.at index da1facd..8416942 100644 --- a/tests/star/gtarfail.at +++ b/tests/star/gtarfail.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/star/gtarfail2.at b/tests/star/gtarfail2.at index 70922d7..e2c52ea 100644 --- a/tests/star/gtarfail2.at +++ b/tests/star/gtarfail2.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/star/multi-fail.at b/tests/star/multi-fail.at index 4639d35..053cfc9 100644 --- a/tests/star/multi-fail.at +++ b/tests/star/multi-fail.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/star/pax-big-10g.at b/tests/star/pax-big-10g.at index e4c44da..ea99caf 100644 --- a/tests/star/pax-big-10g.at +++ b/tests/star/pax-big-10g.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/star/quicktest.sh b/tests/star/quicktest.sh index 91df863..84e5fc1 100755 --- a/tests/star/quicktest.sh +++ b/tests/star/quicktest.sh @@ -1,6 +1,6 @@ #! /bin/sh # This file is part of GNU tar testsuite. -# Copyright 2004-2005, 2007, 2013 Free Software Foundation, Inc. +# Copyright 2004-2005, 2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/star/ustar-big-2g.at b/tests/star/ustar-big-2g.at index ad466f2..1e2081f 100644 --- a/tests/star/ustar-big-2g.at +++ b/tests/star/ustar-big-2g.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/star/ustar-big-8g.at b/tests/star/ustar-big-8g.at index 7fb00d0..6857ce3 100644 --- a/tests/star/ustar-big-8g.at +++ b/tests/star/ustar-big-8g.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/testsuite b/tests/testsuite index 9463a20..c1432b1 100755 --- a/tests/testsuite +++ b/tests/testsuite @@ -610,166 +610,174 @@ at_help_all="1;version.at:19;tar version;; 18;T-nonl.at:27;entries with missing newlines;files-from nonewline nonl t-nonl; 19;indexfile.at:26;tar --index-file=FILE --file=-;stdout indexfile; 20;verbose.at:26;tar cvf -;stdout verbose; -21;gzip.at:23;gzip;gzip; +21;gzip.at:24;gzip;gzip; 22;recurse.at:21;recurse;recurse; -23;shortrec.at:25;short records;shortrec; -24;same-order01.at:26;working -C with --same-order;same-order same-order01; -25;same-order02.at:25;multiple -C options;same-order same-order02; -26;append.at:21;append;append append00; -27;append01.at:29;appending files with long names;append append01; -28;append02.at:54;append vs. create;append append02 append-gnu; -29;append03.at:21;append with name transformation;append append03; -30;append04.at:29;append with verify;append append04 verify append-verify; -31;xform-h.at:30;transforming hard links on create;transform xform xform-h; -32;xform01.at:26;transformations and GNU volume labels;transform xform xform01 volume; -33;exclude.at:23;exclude;exclude; -34;exclude01.at:19;exclude wildcards;exclude exclude01; -35;exclude02.at:19;exclude: anchoring;exclude exclude02; -36;exclude03.at:19;exclude: wildcards match slash;exclude exclude03; -37;exclude04.at:19;exclude: case insensitive;exclude exclude04; -38;exclude05.at:21;exclude: lots of excludes;exclude exclude05; -39;exclude06.at:26;exclude: long files in pax archives;exclude exclude06; -40;exclude07.at:19;exclude: --exclude-backups option;exclude exclude07; -41;exclude08.at:36;--exclude-tag option;exclude exclude-tag exclude08; -42;exclude09.at:37;--exclude-tag option and --listed-incremental;exclude exclude-tag listed incremental exclude09; -43;exclude10.at:38;--exclude-tag option in incremental pass;exclude exclude-tag listed incremental exclude10; -44;exclude11.at:36;--exclude-tag-under option;exclude exclude-tag exclude-tag-under exclude11; -45;exclude12.at:37;--exclude-tag-under and --listed-incremental;exclude exclude-tag exclude-tag-under listed incremental exclude12; -46;exclude13.at:39;--exclude-tag-under option in incremental pass;exclude exclude-tag exclude-tag-under listed incremental exclude13; -47;exclude14.at:36;--exclude-tag-all option;exclude exclude-tag exclude-tag-all exclude14; -48;exclude15.at:36;--exclude-tag-all and --listed-incremental;exclude exclude-tag exclude-tag-all listed incremental exclude15; -49;exclude16.at:38;--exclude-tag-all option in incremental pass;exclude exclude-tag exclude-tag-all listed incremental exclude16; -50;delete01.at:23;deleting a member after a big one;delete delete01; -51;delete02.at:23;deleting a member from stdin archive;delete delete02; -52;delete03.at:21;deleting members with long names;delete delete03; -53;delete04.at:23;deleting a large last member;delete delete04; -54;delete05.at:27;deleting non-existing member;delete delete05; -55;extrac01.at:23;extract over an existing directory;extract extract01; -56;extrac02.at:23;extracting symlinks over an existing file;extract extract02 symlink; -57;extrac03.at:23;extraction loops;extract extract03; -58;extrac04.at:23;extract + fnmatch;extract extract04 fnmatch; -59;extrac05.at:30;extracting selected members from pax;extract extract05; -60;extrac06.at:34;mode of extracted directories;extract extract06 directory mode; -61;extrac07.at:27;extracting symlinks to a read-only dir;extract extract07 read-only symlink; -62;extrac08.at:33;restoring mode on existing directory;extract extrac08; -63;extrac09.at:24;no need to save dir with unreadable . and ..;extract extrac09; -64;extrac10.at:29;-C and delayed setting of metadata;extract extrac10; -65;extrac11.at:25;scarce file descriptors;extract extrac11; -66;extrac12.at:25;extract dot permissions;extract extrac12; -67;extrac13.at:26;extract over symlinks;extract extrac13; -68;extrac14.at:25;extract -C symlink;extract extrac14; -69;extrac15.at:25;extract parent mkdir failure;extract extrac15; -70;extrac16.at:26;extract empty directory with -C;extract extrac16; -71;extrac17.at:21;name matching/transformation ordering;extract extrac17; -72;extrac18.at:34;keep-old-files;extract extrac18 old-files keep-old-files; -73;extrac19.at:21;skip-old-files;extract extrac19 old-files skip-old-files; -74;backup01.at:33;extracting existing dir with --backup;extract backup backup01; -75;label01.at:21;single-volume label;label label01; -76;label02.at:21;multi-volume label;label label02 multi-label multivolume multiv; -77;label03.at:27;test-label option;label label03 test-label; -78;label04.at:27;label with non-create option;label label04; -79;label05.at:24;label with non-create option;label label05; -80;incremental.at:23;incremental;incremental listed incr00; -81;incr01.at:27;restore broken symlinks from incremental;incremental incr01; -82;incr02.at:32;restoring timestamps from incremental;incremental timestamp restore incr02; -83;listed01.at:26;--listed for individual files;listed incremental listed01; -84;listed02.at:28;working --listed;listed incremental listed02; -85;listed03.at:24;incremental dump when the parent directory is unreadable;listed incremental listed03; -86;listed04.at:26;--listed-incremental and --one-file-system;listed incremental listed04; -87;listed05.at:33;--listed-incremental and remounted directories;listed incremental listed05; -88;incr03.at:28;renamed files in incrementals;incremental incr03 rename; -89;incr04.at:29;proper icontents initialization;incremental incr04 icontents; -90;incr05.at:21;incremental dumps with -C;incremental incr05; -91;incr06.at:21;incremental dumps of nested directories;incremental incr06; -92;incr07.at:18;incremental restores with -C;incremental extract incr07; -93;incr08.at:38;filename normalization;incremental create incr08; -94;incr09.at:26;incremental with alternating -C;incremental create incr09; -95;filerem01.at:36;file removed as we read it (ca. 22 seconds);create incremental listed filechange filerem filerem01; -96;filerem02.at:26;toplevel file removed (ca. 24 seconds);create incremental listed filechange filerem filerem02; -97;rename01.at:24;renamed dirs in incrementals;incremental rename rename01; -98;rename02.at:24;move between hierarchies;incremental rename rename02; -99;rename03.at:23;cyclic renames;incremental rename rename03 cyclic-rename; -100;rename04.at:27;renamed directory containing subdirectories;incremental rename04 rename; -101;rename05.at:24;renamed subdirectories;incremental rename05 rename; -102;chtype.at:27;changed file types in incrementals;incremental listed chtype; -103;ignfail.at:23;ignfail;ignfail; -104;link01.at:33;link count gt 2;hardlinks link01; -105;link02.at:32;preserve hard links with --remove-files;hardlinks link02; -106;link03.at:24;working -l with --remove-files;hardlinks link03; -107;link04.at:29;link count is 1 but multiple occurrences;hardlinks link04; -108;longv7.at:24;long names in V7 archives;longname longv7; -109;long01.at:28;long file names divisible by block size;longname long512; -110;lustar01.at:21;ustar: unsplittable file name;longname ustar lustar01; -111;lustar02.at:21;ustar: unsplittable path name;longname ustar lustar02; -112;lustar03.at:21;ustar: splitting long names;longname ustar lustar03; -113;old.at:23;old archives;old; -114;time01.at:20;time: tricky time stamps;time time01; -115;multiv01.at:23;multivolume dumps from pipes;multivolume multiv multiv01; -116;multiv02.at:28;skipping a straddling member;multivolume multiv multiv02; -117;multiv03.at:30;MV archive & long filenames;multivolume multiv multiv03; -118;multiv04.at:36;split directory members in a MV archive;multivolume multiv incremental listed multiv04; -119;multiv05.at:26;Restoring after an out of sync volume;multivolume multiv multiv05 sync; -120;multiv06.at:27;Multivolumes with L=record_size;multivolume multiv multiv06; -121;multiv07.at:28;volumes split at an extended header;multivolume multiv multiv07 xsplit; -122;multiv08.at:25;multivolume header creation;multivolume multiv multiv08; -123;owner.at:21;--owner and --group;owner; -124;sparse01.at:21;sparse files;sparse sparse01; -125;sparse02.at:21;extracting sparse file over a pipe;sparse sparse02; -126;sparse03.at:21;storing sparse files > 8G;sparse sparse03; -127;sparse04.at:21;storing long sparse file names;sparse sparse04; -128;sparsemv.at:21;sparse files in MV archives;sparse multiv sparsemv; -129;spmvp00.at:21;sparse files in PAX MV archives, v.0.0;sparse multivolume multiv sparsemvp sparsemvp00; -130;spmvp01.at:21;sparse files in PAX MV archives, v.0.1;sparse multiv sparsemvp sparsemvp01; -131;spmvp10.at:21;sparse files in PAX MV archives, v.1.0;sparse multivolume multiv sparsemvp sparsemvp10; -132;update.at:28;update unchanged directories;update update00; -133;update01.at:29;update directories;update update01; -134;update02.at:26;update changed files;update update02; -135;verify.at:25;verify;verify; -136;volume.at:23;volume;volume volcheck; -137;volsize.at:29;volume header size;volume volsize; -138;comprec.at:21;compressed format recognition;comprec; -139;shortfile.at:26;short input files;shortfile shortfile0; -140;shortupd.at:31;updating short archives;shortfile shortfile1 shortupd; -141;truncate.at:29;truncate;truncate filechange; -142;grow.at:24;grow;grow filechange; -143;sigpipe.at:21;sigpipe handling;sigpipe; -144;remfiles01.at:28;remove-files with compression;create remove-files remfiles01 gzip; -145;remfiles02.at:28;remove-files with compression: grand-child;create remove-files remfiles02 gzip; -146;remfiles03.at:28;remove-files with symbolic links;create remove-files remfiles03; -147;remfiles04a.at:25;remove-files with -C:rel in -c/non-incr. mode;create remove-files remfiles04 remfiles04a; -148;remfiles04b.at:33;remove-files with -C:rel in -c/incr. mode;create incremental remove-files remfiles04 remfiles04b; -149;remfiles04c.at:33;remove-files with -C:rel in -r mode;create append remove-files remfiles04 remfiles04c; -150;remfiles05a.at:34;remove-files with -C:rel,rel in -c/non-incr. mode;create remove-files remfiles05 remfiles05a; -151;remfiles05b.at:25;remove-files with -C:rel,rel in -c/incr. mode;create incremental remove-files remfiles05 remfiles05b; -152;remfiles05c.at:25;remove-files with -C:rel,rel in -r mode;create append remove-files remfiles05 remfiles05c; -153;remfiles06a.at:25;remove-files with -C:rel,abs in -c/non-incr. mode;create remove-files remfiles06 remfiles06a; -154;remfiles06b.at:25;remove-files with -C:rel,abs in -c/incr. mode;create incremental remove-files remfiles06 remfiles06b; -155;remfiles06c.at:25;remove-files with -C:rel,abs in -r mode;create append remove-files remfiles06 remfiles06c; -156;remfiles07a.at:25;remove-files with -C:rel,abs in -c/non-incr. mode;create remove-files remfiles07 remfiles07a; -157;remfiles07b.at:25;remove-files with -C:rel,abs in -c/incr. mode;create incremental remove-files remfiles07 remfiles07b; -158;remfiles07c.at:25;remove-files with -C:rel,abs in -r mode;create append remove-files remfiles07 remfiles07c; -159;remfiles08a.at:25;remove-files with -C:abs,rel in -c/non-incr. mode;create remove-files remfiles08 remfiles08a; -160;remfiles08b.at:25;remove-files with -C:abs,rel in -c/incr. mode;create incremental remove-files remfiles08 remfiles08b; -161;remfiles08c.at:25;remove-files with -C:abs,rel in -r mode;create append remove-files remfiles08 remfiles08c; -162;remfiles09a.at:25;remove-files on full directory in -c/non-incr. mode;create remove-files remfiles09 remfiles09a; -163;remfiles09b.at:29;remove-files on full directory in -c/incr. mode;create incremental remove-files remfiles09 remfiles09b; -164;remfiles09c.at:25;remove-files on full directory in -r mode;create append remove-files remfiles09 remfiles09c; -165;xattr01.at:25;xattrs: basic functionality;xattrs xattr01; -166;xattr02.at:25;xattrs: change directory with -C option;xattrs xattr02; -167;xattr03.at:25;xattrs: trusted.* attributes;xattrs xattr03; -168;xattr04.at:26;xattrs: s/open/openat/ regression;xattrs xattr04; -169;xattr05.at:28;xattrs: keywords with '=' and '%';xattrs xattr05; -170;acls01.at:25;acls: basic functionality;xattrs acls acls01; -171;acls02.at:25;acls: work with -C;xattrs acls acls02; -172;selnx01.at:25;selinux: basic store/restore;xattrs selinux selnx01; -173;selacl01.at:25;acls/selinux: special files & fifos;xattrs selinux acls selacls01; -174;capabs_raw01.at:25;capabilities: binary store/restore;xattrs capabilities capabs_raw01; -175;gtarfail.at:21;gtarfail;star gtarfail; -176;gtarfail2.at:21;gtarfail2;star gtarfail2; -177;multi-fail.at:21;multi-fail;star multivolume multiv multi-fail; -178;ustar-big-2g.at:21;ustar-big-2g;star ustar-big-2g; -179;ustar-big-8g.at:21;ustar-big-8g;star ustar-big-8g; -180;pax-big-10g.at:21;pax-big-10g;star pax-big-10g; +23;recurs02.at:30;recurse: toggle;recurse options recurse02; +24;shortrec.at:25;short records;shortrec; +25;iotty.at:26;terminal input;options iotty; +26;same-order01.at:26;working -C with --same-order;same-order same-order01; +27;same-order02.at:25;multiple -C options;same-order same-order02; +28;append.at:21;append;append append00; +29;append01.at:29;appending files with long names;append append01; +30;append02.at:54;append vs. create;append append02 append-gnu; +31;append03.at:21;append with name transformation;append append03; +32;append04.at:29;append with verify;append append04 verify append-verify; +33;xform-h.at:30;transforming hard links on create;transform xform xform-h; +34;xform01.at:26;transformations and GNU volume labels;transform xform xform01 volume; +35;exclude.at:23;exclude;exclude; +36;exclude01.at:19;exclude wildcards;exclude exclude01; +37;exclude02.at:19;exclude: anchoring;exclude exclude02; +38;exclude03.at:19;exclude: wildcards match slash;exclude exclude03; +39;exclude04.at:19;exclude: case insensitive;exclude exclude04; +40;exclude05.at:21;exclude: lots of excludes;exclude exclude05; +41;exclude06.at:26;exclude: long files in pax archives;exclude exclude06; +42;exclude07.at:19;exclude: --exclude-backups option;exclude exclude07; +43;exclude08.at:36;--exclude-tag option;exclude exclude-tag exclude08; +44;exclude09.at:37;--exclude-tag option and --listed-incremental;exclude exclude-tag listed incremental exclude09; +45;exclude10.at:38;--exclude-tag option in incremental pass;exclude exclude-tag listed incremental exclude10; +46;exclude11.at:36;--exclude-tag-under option;exclude exclude-tag exclude-tag-under exclude11; +47;exclude12.at:37;--exclude-tag-under and --listed-incremental;exclude exclude-tag exclude-tag-under listed incremental exclude12; +48;exclude13.at:39;--exclude-tag-under option in incremental pass;exclude exclude-tag exclude-tag-under listed incremental exclude13; +49;exclude14.at:36;--exclude-tag-all option;exclude exclude-tag exclude-tag-all exclude14; +50;exclude15.at:36;--exclude-tag-all and --listed-incremental;exclude exclude-tag exclude-tag-all listed incremental exclude15; +51;exclude16.at:38;--exclude-tag-all option in incremental pass;exclude exclude-tag exclude-tag-all listed incremental exclude16; +52;delete01.at:23;deleting a member after a big one;delete delete01; +53;delete02.at:23;deleting a member from stdin archive;delete delete02; +54;delete03.at:21;deleting members with long names;delete delete03; +55;delete04.at:23;deleting a large last member;delete delete04; +56;delete05.at:27;deleting non-existing member;delete delete05; +57;extrac01.at:23;extract over an existing directory;extract extract01; +58;extrac02.at:23;extracting symlinks over an existing file;extract extract02 symlink; +59;extrac03.at:23;extraction loops;extract extract03; +60;extrac04.at:23;extract + fnmatch;extract extract04 fnmatch; +61;extrac05.at:30;extracting selected members from pax;extract extract05; +62;extrac06.at:34;mode of extracted directories;extract extract06 directory mode; +63;extrac07.at:27;extracting symlinks to a read-only dir;extract extract07 read-only symlink; +64;extrac08.at:33;restoring mode on existing directory;extract extrac08; +65;extrac09.at:34;extracting even when . and .. are unreadable;extract extrac09; +66;extrac10.at:29;-C and delayed setting of metadata;extract extrac10; +67;extrac11.at:25;scarce file descriptors;extract extrac11; +68;extrac12.at:25;extract dot permissions;extract extrac12; +69;extrac13.at:26;extract over symlinks;extract extrac13; +70;extrac14.at:25;extract -C symlink;extract extrac14; +71;extrac15.at:25;extract parent mkdir failure;extract extrac15; +72;extrac16.at:26;extract empty directory with -C;extract extrac16; +73;extrac17.at:21;name matching/transformation ordering;extract extrac17; +74;extrac18.at:34;keep-old-files;extract extrac18 old-files keep-old-files; +75;extrac19.at:21;skip-old-files;extract extrac19 old-files skip-old-files; +76;backup01.at:33;extracting existing dir with --backup;extract backup backup01; +77;label01.at:21;single-volume label;label label01; +78;label02.at:21;multi-volume label;label label02 multi-label multivolume multiv; +79;label03.at:27;test-label option;label label03 test-label; +80;label04.at:27;label with non-create option;label label04; +81;label05.at:24;label with non-create option;label label05; +82;incremental.at:23;incremental;incremental listed incr00; +83;incr01.at:27;restore broken symlinks from incremental;incremental incr01; +84;incr02.at:32;restoring timestamps from incremental;incremental timestamp restore incr02; +85;listed01.at:26;--listed for individual files;listed incremental listed01; +86;listed02.at:28;working --listed;listed incremental listed02; +87;listed03.at:24;incremental dump when the parent directory is unreadable;listed incremental listed03; +88;listed04.at:26;--listed-incremental and --one-file-system;listed incremental listed04; +89;listed05.at:33;--listed-incremental and remounted directories;listed incremental listed05; +90;incr03.at:28;renamed files in incrementals;incremental incr03 rename; +91;incr04.at:29;proper icontents initialization;incremental incr04 icontents; +92;incr05.at:21;incremental dumps with -C;incremental incr05; +93;incr06.at:21;incremental dumps of nested directories;incremental incr06; +94;incr07.at:18;incremental restores with -C;incremental extract incr07; +95;incr08.at:38;filename normalization;incremental create incr08; +96;incr09.at:26;incremental with alternating -C;incremental create incr09; +97;filerem01.at:36;file removed as we read it (ca. 22 seconds);create incremental listed filechange filerem filerem01; +98;filerem02.at:26;toplevel file removed (ca. 24 seconds);create incremental listed filechange filerem filerem02; +99;rename01.at:24;renamed dirs in incrementals;incremental rename rename01; +100;rename02.at:24;move between hierarchies;incremental rename rename02; +101;rename03.at:23;cyclic renames;incremental rename rename03 cyclic-rename; +102;rename04.at:27;renamed directory containing subdirectories;incremental rename04 rename; +103;rename05.at:24;renamed subdirectories;incremental rename05 rename; +104;chtype.at:27;changed file types in incrementals;incremental listed chtype; +105;ignfail.at:23;ignfail;ignfail; +106;link01.at:33;link count gt 2;hardlinks link01; +107;link02.at:32;preserve hard links with --remove-files;hardlinks link02; +108;link03.at:24;working -l with --remove-files;hardlinks link03; +109;link04.at:29;link count is 1 but multiple occurrences;hardlinks link04; +110;longv7.at:24;long names in V7 archives;longname longv7; +111;long01.at:28;long file names divisible by block size;longname long512; +112;lustar01.at:21;ustar: unsplittable file name;longname ustar lustar01; +113;lustar02.at:21;ustar: unsplittable path name;longname ustar lustar02; +114;lustar03.at:21;ustar: splitting long names;longname ustar lustar03; +115;old.at:23;old archives;old; +116;time01.at:20;time: tricky time stamps;time time01; +117;multiv01.at:24;multivolume dumps from pipes;multivolume multiv multiv01; +118;multiv02.at:28;skipping a straddling member;multivolume multiv multiv02; +119;multiv03.at:30;MV archive & long filenames;multivolume multiv multiv03; +120;multiv04.at:36;split directory members in a MV archive;multivolume multiv incremental listed multiv04; +121;multiv05.at:26;Restoring after an out of sync volume;multivolume multiv multiv05 sync; +122;multiv06.at:27;Multivolumes with L=record_size;multivolume multiv multiv06; +123;multiv07.at:28;volumes split at an extended header;multivolume multiv multiv07 xsplit; +124;multiv08.at:25;multivolume header creation;multivolume multiv multiv08; +125;owner.at:21;--owner and --group;owner; +126;sparse01.at:21;sparse files;sparse sparse01; +127;sparse02.at:21;extracting sparse file over a pipe;sparse sparse02; +128;sparse03.at:21;storing sparse files > 8G;sparse sparse03; +129;sparse04.at:21;storing long sparse file names;sparse sparse04; +130;sparsemv.at:21;sparse files in MV archives;sparse multiv sparsemv; +131;spmvp00.at:21;sparse files in PAX MV archives, v.0.0;sparse multivolume multiv sparsemvp sparsemvp00; +132;spmvp01.at:21;sparse files in PAX MV archives, v.0.1;sparse multiv sparsemvp sparsemvp01; +133;spmvp10.at:21;sparse files in PAX MV archives, v.1.0;sparse multivolume multiv sparsemvp sparsemvp10; +134;update.at:28;update unchanged directories;update update00; +135;update01.at:29;update directories;update update01; +136;update02.at:26;update changed files;update update02; +137;verify.at:25;verify;verify; +138;volume.at:23;volume;volume volcheck; +139;volsize.at:29;volume header size;volume volsize; +140;comprec.at:21;compressed format recognition;comprec; +141;shortfile.at:26;short input files;shortfile shortfile0; +142;shortupd.at:31;updating short archives;shortfile shortfile1 shortupd; +143;truncate.at:29;truncate;truncate filechange; +144;grow.at:24;grow;grow filechange; +145;sigpipe.at:21;sigpipe handling;sigpipe; +146;remfiles01.at:28;remove-files with compression;create remove-files remfiles01 gzip; +147;remfiles02.at:28;remove-files with compression: grand-child;create remove-files remfiles02 gzip; +148;remfiles03.at:28;remove-files with symbolic links;create remove-files remfiles03; +149;remfiles04a.at:25;remove-files with -C:rel in -c/non-incr. mode;create remove-files remfiles04 remfiles04a; +150;remfiles04b.at:33;remove-files with -C:rel in -c/incr. mode;create incremental remove-files remfiles04 remfiles04b; +151;remfiles04c.at:33;remove-files with -C:rel in -r mode;create append remove-files remfiles04 remfiles04c; +152;remfiles05a.at:34;remove-files with -C:rel,rel in -c/non-incr. mode;create remove-files remfiles05 remfiles05a; +153;remfiles05b.at:25;remove-files with -C:rel,rel in -c/incr. mode;create incremental remove-files remfiles05 remfiles05b; +154;remfiles05c.at:25;remove-files with -C:rel,rel in -r mode;create append remove-files remfiles05 remfiles05c; +155;remfiles06a.at:25;remove-files with -C:rel,abs in -c/non-incr. mode;create remove-files remfiles06 remfiles06a; +156;remfiles06b.at:25;remove-files with -C:rel,abs in -c/incr. mode;create incremental remove-files remfiles06 remfiles06b; +157;remfiles06c.at:25;remove-files with -C:rel,abs in -r mode;create append remove-files remfiles06 remfiles06c; +158;remfiles07a.at:25;remove-files with -C:abs,rel in -c/non-incr. mode;create remove-files remfiles07 remfiles07a; +159;remfiles07b.at:25;remove-files with -C:abs,rel in -c/incr. mode;create incremental remove-files remfiles07 remfiles07b; +160;remfiles07c.at:25;remove-files with -C:abs,rel in -r mode;create append remove-files remfiles07 remfiles07c; +161;remfiles08a.at:28;remove-files deleting two subdirs in -c/non-incr. mode;create remove-files remfiles08 remfiles08a; +162;remfiles08b.at:31;remove-files deleting two subdirs in -c/incr. mode;create incremental remove-files remfiles08 remfiles08b; +163;remfiles08c.at:28;remove-files deleting two subdirs in -r mode;create append remove-files remfiles08 remfiles08c; +164;remfiles09a.at:25;remove-files on full directory in -c/non-incr. mode;create remove-files remfiles09 remfiles09a; +165;remfiles09b.at:29;remove-files on full directory in -c/incr. mode;create incremental remove-files remfiles09 remfiles09b; +166;remfiles09c.at:25;remove-files on full directory in -r mode;create append remove-files remfiles09 remfiles09c; +167;remfiles10.at:20;remove-files;create remove-files remfiles10; +168;xattr01.at:25;xattrs: basic functionality;xattrs xattr01; +169;xattr02.at:25;xattrs: change directory with -C option;xattrs xattr02; +170;xattr03.at:25;xattrs: trusted.* attributes;xattrs xattr03; +171;xattr04.at:26;xattrs: s/open/openat/ regression;xattrs xattr04; +172;xattr05.at:28;xattrs: keywords with '=' and '%';xattrs xattr05; +173;acls01.at:25;acls: basic functionality;xattrs acls acls01; +174;acls02.at:25;acls: work with -C;xattrs acls acls02; +175;acls03.at:30;acls: default ACLs;xattrs acls acls03; +176;selnx01.at:25;selinux: basic store/restore;xattrs selinux selnx01; +177;selacl01.at:25;acls/selinux: special files & fifos;xattrs selinux acls selacls01; +178;capabs_raw01.at:25;capabilities: binary store/restore;xattrs capabilities capabs_raw01; +179;onetop01.at:21;tar --one-top-level;extract onetop onetop01; +180;onetop02.at:21;tar --one-top-level --show-transformed;extract onetop onetop02; +181;onetop03.at:21;tar --one-top-level --transform;extract onetop onetop02; +182;onetop04.at:21;tar --one-top-level --transform;extract onetop onetop02; +183;gtarfail.at:21;gtarfail;star gtarfail; +184;gtarfail2.at:21;gtarfail2;star gtarfail2; +185;multi-fail.at:21;multi-fail;star multivolume multiv multi-fail; +186;ustar-big-2g.at:21;ustar-big-2g;star ustar-big-2g; +187;ustar-big-8g.at:21;ustar-big-8g;star ustar-big-8g; +188;pax-big-10g.at:21;pax-big-10g;star pax-big-10g; " # List of the all the test groups. at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'` @@ -783,7 +791,7 @@ at_fn_validate_ranges () for at_grp do eval at_value=\$$at_grp - if test $at_value -lt 1 || test $at_value -gt 180; then + if test $at_value -lt 1 || test $at_value -gt 188; then $as_echo "invalid test group: $at_value" >&2 exit 1 fi @@ -1082,7 +1090,7 @@ fi # List of tests. if $at_list_p; then cat <<_ATEOF || at_write_fail=1 -GNU tar 1.27 test suite test groups: +GNU tar 1.28 test suite test groups: NUM: FILE-NAME:LINE TEST-GROUP-NAME KEYWORDS @@ -1123,7 +1131,7 @@ _ATEOF exit $at_write_fail fi if $at_version_p; then - $as_echo "$as_me (GNU tar 1.27)" && + $as_echo "$as_me (GNU tar 1.28)" && cat <<\_ATEOF || at_write_fail=1 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1149,75 +1157,78 @@ at_banner_text_2="The -T option" # Banner 3. testsuite.at:209 # Category starts at test group 19. at_banner_text_3="Various options" -# Banner 4. testsuite.at:216 -# Category starts at test group 24. -at_banner_text_4="The --same-order option" -# Banner 5. testsuite.at:220 +# Banner 4. testsuite.at:218 # Category starts at test group 26. +at_banner_text_4="The --same-order option" +# Banner 5. testsuite.at:222 +# Category starts at test group 28. at_banner_text_5="Append" -# Banner 6. testsuite.at:227 -# Category starts at test group 31. -at_banner_text_6="Transforms" -# Banner 7. testsuite.at:231 +# Banner 6. testsuite.at:229 # Category starts at test group 33. +at_banner_text_6="Transforms" +# Banner 7. testsuite.at:233 +# Category starts at test group 35. at_banner_text_7="Exclude" -# Banner 8. testsuite.at:250 -# Category starts at test group 50. +# Banner 8. testsuite.at:252 +# Category starts at test group 52. at_banner_text_8="Deletions" -# Banner 9. testsuite.at:257 -# Category starts at test group 55. +# Banner 9. testsuite.at:259 +# Category starts at test group 57. at_banner_text_9="Extracting" -# Banner 10. testsuite.at:279 -# Category starts at test group 75. +# Banner 10. testsuite.at:281 +# Category starts at test group 77. at_banner_text_10="Volume label operations" -# Banner 11. testsuite.at:286 -# Category starts at test group 80. +# Banner 11. testsuite.at:288 +# Category starts at test group 82. at_banner_text_11="Incremental archives" -# Banner 12. testsuite.at:303 -# Category starts at test group 95. -at_banner_text_12="Files removed while archiving" -# Banner 13. testsuite.at:307 +# Banner 12. testsuite.at:305 # Category starts at test group 97. +at_banner_text_12="Files removed while archiving" +# Banner 13. testsuite.at:309 +# Category starts at test group 99. at_banner_text_13="Renames" -# Banner 14. testsuite.at:315 -# Category starts at test group 103. +# Banner 14. testsuite.at:317 +# Category starts at test group 105. at_banner_text_14="Ignore failing reads" -# Banner 15. testsuite.at:318 -# Category starts at test group 104. +# Banner 15. testsuite.at:320 +# Category starts at test group 106. at_banner_text_15="Link handling" -# Banner 16. testsuite.at:324 -# Category starts at test group 108. +# Banner 16. testsuite.at:326 +# Category starts at test group 110. at_banner_text_16="Specific archive formats" -# Banner 17. testsuite.at:334 -# Category starts at test group 115. +# Banner 17. testsuite.at:336 +# Category starts at test group 117. at_banner_text_17="Multivolume archives" -# Banner 18. testsuite.at:344 -# Category starts at test group 123. +# Banner 18. testsuite.at:346 +# Category starts at test group 125. at_banner_text_18="Owner and Groups" -# Banner 19. testsuite.at:347 -# Category starts at test group 124. +# Banner 19. testsuite.at:349 +# Category starts at test group 126. at_banner_text_19="Sparse files" -# Banner 20. testsuite.at:357 -# Category starts at test group 132. +# Banner 20. testsuite.at:359 +# Category starts at test group 134. at_banner_text_20="Updates" -# Banner 21. testsuite.at:362 -# Category starts at test group 135. +# Banner 21. testsuite.at:364 +# Category starts at test group 137. at_banner_text_21="Verifying the archive" -# Banner 22. testsuite.at:365 -# Category starts at test group 136. -at_banner_text_22="Volume operations" -# Banner 23. testsuite.at:369 +# Banner 22. testsuite.at:367 # Category starts at test group 138. +at_banner_text_22="Volume operations" +# Banner 23. testsuite.at:371 +# Category starts at test group 140. at_banner_text_23="" -# Banner 24. testsuite.at:378 -# Category starts at test group 144. +# Banner 24. testsuite.at:380 +# Category starts at test group 146. at_banner_text_24="Removing files after archiving" -# Banner 25. testsuite.at:401 -# Category starts at test group 165. +# Banner 25. testsuite.at:404 +# Category starts at test group 168. at_banner_text_25="Extended attributes" -# Banner 26. testsuite.at:416 -# Category starts at test group 175. -at_banner_text_26="Star tests" +# Banner 26. testsuite.at:420 +# Category starts at test group 179. +at_banner_text_26="One top level" +# Banner 27. testsuite.at:426 +# Category starts at test group 183. +at_banner_text_27="Star tests" # Take any -C into account. if $at_change_dir ; then @@ -1378,11 +1389,11 @@ exec 5>>"$at_suite_log" # Banners and logs. $as_echo "## ------------------------ ## -## GNU tar 1.27 test suite. ## +## GNU tar 1.28 test suite. ## ## ------------------------ ##" { $as_echo "## ------------------------ ## -## GNU tar 1.27 test suite. ## +## GNU tar 1.28 test suite. ## ## ------------------------ ##" echo @@ -2226,7 +2237,7 @@ _ASBOX $as_echo "Please send $at_msg and all information you think might help: To: - Subject: [GNU tar 1.27] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly} + Subject: [GNU tar 1.28] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly} You may investigate any problem if you feel able to do so, in which case the test suite provides a good starting point. Its output may @@ -2257,7 +2268,7 @@ at_fn_check_prepare_notrace 'a shell pipeline' "version.at:21" at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: -echo >>"$at_stdout"; $as_echo "tar (GNU tar) 1.27 +echo >>"$at_stdout"; $as_echo "tar (GNU tar) 1.28 " | \ $at_diff - "$at_stdout" || at_failed=: at_fn_check_status 0 $at_status "$at_srcdir/version.at:21" @@ -2717,7 +2728,7 @@ tar --occurrence=1 -cf test.tar . ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo >>"$at_stderr"; $as_echo "tar: --occurrence cannot be used with -c +echo >>"$at_stderr"; $as_echo "tar: '--occurrence' cannot be used with '-c' Try 'tar --help' or 'tar --usage' for more information. " | \ $at_diff - "$at_stderr" || at_failed=: @@ -2789,7 +2800,7 @@ tar -tWf test.tar . ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter -echo >>"$at_stderr"; $as_echo "tar: --verify cannot be used with -t +echo >>"$at_stderr"; $as_echo "tar: '--verify' cannot be used with '-t' Try 'tar --help' or 'tar --usage' for more information. " | \ $at_diff - "$at_stderr" || at_failed=: @@ -4222,7 +4233,7 @@ $at_traceon; } read at_status <"$at_status_file" #AT_STOP_20 #AT_START_21 -at_fn_group_banner 21 'gzip.at:23' \ +at_fn_group_banner 21 'gzip.at:24' \ "gzip" " " 3 at_xfail=no ( @@ -4234,7 +4245,7 @@ at_xfail=no unset TAR_OPTIONS { set +x -$as_echo "$at_srcdir/gzip.at:28: +$as_echo "$at_srcdir/gzip.at:29: cat /dev/null | gzip - > /dev/null 2>&1 || exit 77 @@ -4243,7 +4254,7 @@ RC=\$? sed -n '/^tar:/p' err >&2 exit \$RC " -at_fn_check_prepare_notrace 'an embedded newline' "gzip.at:28" +at_fn_check_prepare_notrace 'an embedded newline' "gzip.at:29" ( $at_check_trace; cat /dev/null | gzip - > /dev/null 2>&1 || exit 77 @@ -4261,7 +4272,7 @@ tar: Error is not recoverable: exiting now " | \ $at_diff - "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 2 $at_status "$at_srcdir/gzip.at:28" +at_fn_check_status 2 $at_status "$at_srcdir/gzip.at:29" $at_failed && at_fn_log_failure $at_traceon; } @@ -4498,8 +4509,8 @@ $at_traceon; } read at_status <"$at_status_file" #AT_STOP_22 #AT_START_23 -at_fn_group_banner 23 'shortrec.at:25' \ - "short records" " " 3 +at_fn_group_banner 23 'recurs02.at:30' \ + "recurse: toggle" " " 3 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( @@ -4510,6 +4521,262 @@ at_xfail=no + { set +x +$as_echo "$at_srcdir/recurs02.at:33: +mkdir v7 +(cd v7 +TEST_TAR_FORMAT=v7 +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H v7\" +export TAR_OPTIONS +rm -rf * + +mkdir directory1 directory2 +touch directory1/file directory2/file +tar --create --file archive \\ + --no-recursion directory1 \\ + --recursion directory2 || exit 1 +tar tf archive +)" +at_fn_check_prepare_notrace 'an embedded newline' "recurs02.at:33" +( $at_check_trace; +mkdir v7 +(cd v7 +TEST_TAR_FORMAT=v7 +export TEST_TAR_FORMAT +TAR_OPTIONS="-H v7" +export TAR_OPTIONS +rm -rf * + +mkdir directory1 directory2 +touch directory1/file directory2/file +tar --create --file archive \ + --no-recursion directory1 \ + --recursion directory2 || exit 1 +tar tf archive +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "directory1/ +directory2/ +directory2/file +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/recurs02.at:33" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/recurs02.at:33: +mkdir oldgnu +(cd oldgnu +TEST_TAR_FORMAT=oldgnu +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H oldgnu\" +export TAR_OPTIONS +rm -rf * + +mkdir directory1 directory2 +touch directory1/file directory2/file +tar --create --file archive \\ + --no-recursion directory1 \\ + --recursion directory2 || exit 1 +tar tf archive +)" +at_fn_check_prepare_notrace 'an embedded newline' "recurs02.at:33" +( $at_check_trace; +mkdir oldgnu +(cd oldgnu +TEST_TAR_FORMAT=oldgnu +export TEST_TAR_FORMAT +TAR_OPTIONS="-H oldgnu" +export TAR_OPTIONS +rm -rf * + +mkdir directory1 directory2 +touch directory1/file directory2/file +tar --create --file archive \ + --no-recursion directory1 \ + --recursion directory2 || exit 1 +tar tf archive +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "directory1/ +directory2/ +directory2/file +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/recurs02.at:33" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/recurs02.at:33: +mkdir ustar +(cd ustar +TEST_TAR_FORMAT=ustar +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H ustar\" +export TAR_OPTIONS +rm -rf * + +mkdir directory1 directory2 +touch directory1/file directory2/file +tar --create --file archive \\ + --no-recursion directory1 \\ + --recursion directory2 || exit 1 +tar tf archive +)" +at_fn_check_prepare_notrace 'an embedded newline' "recurs02.at:33" +( $at_check_trace; +mkdir ustar +(cd ustar +TEST_TAR_FORMAT=ustar +export TEST_TAR_FORMAT +TAR_OPTIONS="-H ustar" +export TAR_OPTIONS +rm -rf * + +mkdir directory1 directory2 +touch directory1/file directory2/file +tar --create --file archive \ + --no-recursion directory1 \ + --recursion directory2 || exit 1 +tar tf archive +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "directory1/ +directory2/ +directory2/file +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/recurs02.at:33" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/recurs02.at:33: +mkdir posix +(cd posix +TEST_TAR_FORMAT=posix +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H posix\" +export TAR_OPTIONS +rm -rf * + +mkdir directory1 directory2 +touch directory1/file directory2/file +tar --create --file archive \\ + --no-recursion directory1 \\ + --recursion directory2 || exit 1 +tar tf archive +)" +at_fn_check_prepare_notrace 'an embedded newline' "recurs02.at:33" +( $at_check_trace; +mkdir posix +(cd posix +TEST_TAR_FORMAT=posix +export TEST_TAR_FORMAT +TAR_OPTIONS="-H posix" +export TAR_OPTIONS +rm -rf * + +mkdir directory1 directory2 +touch directory1/file directory2/file +tar --create --file archive \ + --no-recursion directory1 \ + --recursion directory2 || exit 1 +tar tf archive +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "directory1/ +directory2/ +directory2/file +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/recurs02.at:33" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/recurs02.at:33: +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H gnu\" +export TAR_OPTIONS +rm -rf * + +mkdir directory1 directory2 +touch directory1/file directory2/file +tar --create --file archive \\ + --no-recursion directory1 \\ + --recursion directory2 || exit 1 +tar tf archive +)" +at_fn_check_prepare_notrace 'an embedded newline' "recurs02.at:33" +( $at_check_trace; +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS="-H gnu" +export TAR_OPTIONS +rm -rf * + +mkdir directory1 directory2 +touch directory1/file directory2/file +tar --create --file archive \ + --no-recursion directory1 \ + --recursion directory2 || exit 1 +tar tf archive +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "directory1/ +directory2/ +directory2/file +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/recurs02.at:33" +$at_failed && at_fn_log_failure +$at_traceon; } + + + + + set +x + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 7>&- | eval $at_tee_pipe +read at_status <"$at_status_file" +#AT_STOP_23 +#AT_START_24 +at_fn_group_banner 24 'shortrec.at:25' \ + "short records" " " 3 +at_xfail=no + test -f $XFAILFILE && at_xfail=yes +( + $as_echo "24. $at_setup_line: testing $at_desc ..." + $at_traceon + + + + + { set +x $as_echo "$at_srcdir/shortrec.at:28: mkdir v7 @@ -4752,14 +5019,212 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_23 -#AT_START_24 -at_fn_group_banner 24 'same-order01.at:26' \ +#AT_STOP_24 +#AT_START_25 +at_fn_group_banner 25 'iotty.at:26' \ + "terminal input" " " 3 +at_xfail=no + test -f $XFAILFILE && at_xfail=yes +( + $as_echo "25. $at_setup_line: testing $at_desc ..." + $at_traceon + + + + + + { set +x +$as_echo "$at_srcdir/iotty.at:29: +mkdir posix +(cd posix +TEST_TAR_FORMAT=posix +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H posix\" +export TAR_OPTIONS +rm -rf * + +test -x \$abs_builddir/ttyemu || exit 77 +TAPE=- +export TAPE +ttyemu -t5 -i/dev/null tar -x +echo \$? +ttyemu -t5 -i/dev/null tar -xz +echo \$? +ttyemu -t5 -i/dev/null tar -c . +echo \$? +)" +at_fn_check_prepare_notrace 'an embedded newline' "iotty.at:29" +( $at_check_trace; +mkdir posix +(cd posix +TEST_TAR_FORMAT=posix +export TEST_TAR_FORMAT +TAR_OPTIONS="-H posix" +export TAR_OPTIONS +rm -rf * + +test -x $abs_builddir/ttyemu || exit 77 +TAPE=- +export TAPE +ttyemu -t5 -i/dev/null tar -x +echo $? +ttyemu -t5 -i/dev/null tar -xz +echo $? +ttyemu -t5 -i/dev/null tar -c . +echo $? +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "tar: Refusing to read archive contents from terminal (missing -f option?) +tar: Error is not recoverable: exiting now +2 +tar: Refusing to read archive contents from terminal (missing -f option?) +tar: Error is not recoverable: exiting now +2 +tar: Refusing to write archive contents to terminal (missing -f option?) +tar: Error is not recoverable: exiting now +2 +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/iotty.at:29" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/iotty.at:29: +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H gnu\" +export TAR_OPTIONS +rm -rf * + +test -x \$abs_builddir/ttyemu || exit 77 +TAPE=- +export TAPE +ttyemu -t5 -i/dev/null tar -x +echo \$? +ttyemu -t5 -i/dev/null tar -xz +echo \$? +ttyemu -t5 -i/dev/null tar -c . +echo \$? +)" +at_fn_check_prepare_notrace 'an embedded newline' "iotty.at:29" +( $at_check_trace; +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS="-H gnu" +export TAR_OPTIONS +rm -rf * + +test -x $abs_builddir/ttyemu || exit 77 +TAPE=- +export TAPE +ttyemu -t5 -i/dev/null tar -x +echo $? +ttyemu -t5 -i/dev/null tar -xz +echo $? +ttyemu -t5 -i/dev/null tar -c . +echo $? +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "tar: Refusing to read archive contents from terminal (missing -f option?) +tar: Error is not recoverable: exiting now +2 +tar: Refusing to read archive contents from terminal (missing -f option?) +tar: Error is not recoverable: exiting now +2 +tar: Refusing to write archive contents to terminal (missing -f option?) +tar: Error is not recoverable: exiting now +2 +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/iotty.at:29" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/iotty.at:29: +mkdir oldgnu +(cd oldgnu +TEST_TAR_FORMAT=oldgnu +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H oldgnu\" +export TAR_OPTIONS +rm -rf * + +test -x \$abs_builddir/ttyemu || exit 77 +TAPE=- +export TAPE +ttyemu -t5 -i/dev/null tar -x +echo \$? +ttyemu -t5 -i/dev/null tar -xz +echo \$? +ttyemu -t5 -i/dev/null tar -c . +echo \$? +)" +at_fn_check_prepare_notrace 'an embedded newline' "iotty.at:29" +( $at_check_trace; +mkdir oldgnu +(cd oldgnu +TEST_TAR_FORMAT=oldgnu +export TEST_TAR_FORMAT +TAR_OPTIONS="-H oldgnu" +export TAR_OPTIONS +rm -rf * + +test -x $abs_builddir/ttyemu || exit 77 +TAPE=- +export TAPE +ttyemu -t5 -i/dev/null tar -x +echo $? +ttyemu -t5 -i/dev/null tar -xz +echo $? +ttyemu -t5 -i/dev/null tar -c . +echo $? +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "tar: Refusing to read archive contents from terminal (missing -f option?) +tar: Error is not recoverable: exiting now +2 +tar: Refusing to read archive contents from terminal (missing -f option?) +tar: Error is not recoverable: exiting now +2 +tar: Refusing to write archive contents to terminal (missing -f option?) +tar: Error is not recoverable: exiting now +2 +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/iotty.at:29" +$at_failed && at_fn_log_failure +$at_traceon; } + + + + + set +x + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 7>&- | eval $at_tee_pipe +read at_status <"$at_status_file" +#AT_STOP_25 +#AT_START_26 +at_fn_group_banner 26 'same-order01.at:26' \ "working -C with --same-order" " " 4 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "24. $at_setup_line: testing $at_desc ..." + $as_echo "26. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5063,14 +5528,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_24 -#AT_START_25 -at_fn_group_banner 25 'same-order02.at:25' \ +#AT_STOP_26 +#AT_START_27 +at_fn_group_banner 27 'same-order02.at:25' \ "multiple -C options" " " 4 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "25. $at_setup_line: testing $at_desc ..." + $as_echo "27. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5409,14 +5874,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_25 -#AT_START_26 -at_fn_group_banner 26 'append.at:21' \ +#AT_STOP_27 +#AT_START_28 +at_fn_group_banner 28 'append.at:21' \ "append" " " 5 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "26. $at_setup_line: testing $at_desc ..." + $as_echo "28. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5630,14 +6095,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_26 -#AT_START_27 -at_fn_group_banner 27 'append01.at:29' \ +#AT_STOP_28 +#AT_START_29 +at_fn_group_banner 29 'append01.at:29' \ "appending files with long names" " " 5 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "27. $at_setup_line: testing $at_desc ..." + $as_echo "29. $at_setup_line: testing $at_desc ..." $at_traceon @@ -5830,14 +6295,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_27 -#AT_START_28 -at_fn_group_banner 28 'append02.at:54' \ +#AT_STOP_29 +#AT_START_30 +at_fn_group_banner 30 'append02.at:54' \ "append vs. create" " " 5 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "28. $at_setup_line: testing $at_desc ..." + $as_echo "30. $at_setup_line: testing $at_desc ..." $at_traceon @@ -6246,14 +6711,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_28 -#AT_START_29 -at_fn_group_banner 29 'append03.at:21' \ +#AT_STOP_30 +#AT_START_31 +at_fn_group_banner 31 'append03.at:21' \ "append with name transformation" " " 5 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "29. $at_setup_line: testing $at_desc ..." + $as_echo "31. $at_setup_line: testing $at_desc ..." $at_traceon @@ -6539,14 +7004,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_29 -#AT_START_30 -at_fn_group_banner 30 'append04.at:29' \ +#AT_STOP_31 +#AT_START_32 +at_fn_group_banner 32 'append04.at:29' \ "append with verify" " " 5 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "30. $at_setup_line: testing $at_desc ..." + $as_echo "32. $at_setup_line: testing $at_desc ..." $at_traceon @@ -6920,14 +7385,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_30 -#AT_START_31 -at_fn_group_banner 31 'xform-h.at:30' \ +#AT_STOP_32 +#AT_START_33 +at_fn_group_banner 33 'xform-h.at:30' \ "transforming hard links on create" " " 6 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "31. $at_setup_line: testing $at_desc ..." + $as_echo "33. $at_setup_line: testing $at_desc ..." $at_traceon @@ -7325,14 +7790,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_31 -#AT_START_32 -at_fn_group_banner 32 'xform01.at:26' \ +#AT_STOP_33 +#AT_START_34 +at_fn_group_banner 34 'xform01.at:26' \ "transformations and GNU volume labels" " " 6 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "32. $at_setup_line: testing $at_desc ..." + $as_echo "34. $at_setup_line: testing $at_desc ..." $at_traceon @@ -7386,14 +7851,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_32 -#AT_START_33 -at_fn_group_banner 33 'exclude.at:23' \ +#AT_STOP_34 +#AT_START_35 +at_fn_group_banner 35 'exclude.at:23' \ "exclude" " " 7 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "33. $at_setup_line: testing $at_desc ..." + $as_echo "35. $at_setup_line: testing $at_desc ..." $at_traceon @@ -7603,14 +8068,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_33 -#AT_START_34 -at_fn_group_banner 34 'exclude01.at:19' \ +#AT_STOP_35 +#AT_START_36 +at_fn_group_banner 36 'exclude01.at:19' \ "exclude wildcards" " " 7 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "34. $at_setup_line: testing $at_desc ..." + $as_echo "36. $at_setup_line: testing $at_desc ..." $at_traceon @@ -8184,14 +8649,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_34 -#AT_START_35 -at_fn_group_banner 35 'exclude02.at:19' \ +#AT_STOP_36 +#AT_START_37 +at_fn_group_banner 37 'exclude02.at:19' \ "exclude: anchoring" " " 7 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "35. $at_setup_line: testing $at_desc ..." + $as_echo "37. $at_setup_line: testing $at_desc ..." $at_traceon @@ -8825,14 +9290,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_35 -#AT_START_36 -at_fn_group_banner 36 'exclude03.at:19' \ +#AT_STOP_37 +#AT_START_38 +at_fn_group_banner 38 'exclude03.at:19' \ "exclude: wildcards match slash" " " 7 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "36. $at_setup_line: testing $at_desc ..." + $as_echo "38. $at_setup_line: testing $at_desc ..." $at_traceon @@ -9426,14 +9891,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_36 -#AT_START_37 -at_fn_group_banner 37 'exclude04.at:19' \ +#AT_STOP_38 +#AT_START_39 +at_fn_group_banner 39 'exclude04.at:19' \ "exclude: case insensitive" " " 7 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "37. $at_setup_line: testing $at_desc ..." + $as_echo "39. $at_setup_line: testing $at_desc ..." $at_traceon @@ -10042,14 +10507,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_37 -#AT_START_38 -at_fn_group_banner 38 'exclude05.at:21' \ +#AT_STOP_39 +#AT_START_40 +at_fn_group_banner 40 'exclude05.at:21' \ "exclude: lots of excludes" " " 7 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "38. $at_setup_line: testing $at_desc ..." + $as_echo "40. $at_setup_line: testing $at_desc ..." $at_traceon @@ -10518,14 +10983,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_38 -#AT_START_39 -at_fn_group_banner 39 'exclude06.at:26' \ +#AT_STOP_40 +#AT_START_41 +at_fn_group_banner 41 'exclude06.at:26' \ "exclude: long files in pax archives" " " 7 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "39. $at_setup_line: testing $at_desc ..." + $as_echo "41. $at_setup_line: testing $at_desc ..." $at_traceon @@ -10593,14 +11058,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_39 -#AT_START_40 -at_fn_group_banner 40 'exclude07.at:19' \ +#AT_STOP_41 +#AT_START_42 +at_fn_group_banner 42 'exclude07.at:19' \ "exclude: --exclude-backups option" " " 7 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "40. $at_setup_line: testing $at_desc ..." + $as_echo "42. $at_setup_line: testing $at_desc ..." $at_traceon @@ -10854,14 +11319,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_40 -#AT_START_41 -at_fn_group_banner 41 'exclude08.at:36' \ +#AT_STOP_42 +#AT_START_43 +at_fn_group_banner 43 'exclude08.at:36' \ "--exclude-tag option" " " 7 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "41. $at_setup_line: testing $at_desc ..." + $as_echo "43. $at_setup_line: testing $at_desc ..." $at_traceon @@ -11115,14 +11580,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_41 -#AT_START_42 -at_fn_group_banner 42 'exclude09.at:37' \ +#AT_STOP_43 +#AT_START_44 +at_fn_group_banner 44 'exclude09.at:37' \ "--exclude-tag option and --listed-incremental" " " 7 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "42. $at_setup_line: testing $at_desc ..." + $as_echo "44. $at_setup_line: testing $at_desc ..." $at_traceon @@ -11186,14 +11651,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_42 -#AT_START_43 -at_fn_group_banner 43 'exclude10.at:38' \ +#AT_STOP_44 +#AT_START_45 +at_fn_group_banner 45 'exclude10.at:38' \ "--exclude-tag option in incremental pass" " " 7 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "43. $at_setup_line: testing $at_desc ..." + $as_echo "45. $at_setup_line: testing $at_desc ..." $at_traceon @@ -11280,14 +11745,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_43 -#AT_START_44 -at_fn_group_banner 44 'exclude11.at:36' \ +#AT_STOP_45 +#AT_START_46 +at_fn_group_banner 46 'exclude11.at:36' \ "--exclude-tag-under option" " " 7 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "44. $at_setup_line: testing $at_desc ..." + $as_echo "46. $at_setup_line: testing $at_desc ..." $at_traceon @@ -11536,14 +12001,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_44 -#AT_START_45 -at_fn_group_banner 45 'exclude12.at:37' \ +#AT_STOP_46 +#AT_START_47 +at_fn_group_banner 47 'exclude12.at:37' \ "--exclude-tag-under and --listed-incremental" " " 7 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "45. $at_setup_line: testing $at_desc ..." + $as_echo "47. $at_setup_line: testing $at_desc ..." $at_traceon @@ -11606,14 +12071,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_45 -#AT_START_46 -at_fn_group_banner 46 'exclude13.at:39' \ +#AT_STOP_47 +#AT_START_48 +at_fn_group_banner 48 'exclude13.at:39' \ "--exclude-tag-under option in incremental pass" " " 7 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "46. $at_setup_line: testing $at_desc ..." + $as_echo "48. $at_setup_line: testing $at_desc ..." $at_traceon @@ -11699,14 +12164,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_46 -#AT_START_47 -at_fn_group_banner 47 'exclude14.at:36' \ +#AT_STOP_48 +#AT_START_49 +at_fn_group_banner 49 'exclude14.at:36' \ "--exclude-tag-all option" " " 7 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "47. $at_setup_line: testing $at_desc ..." + $as_echo "49. $at_setup_line: testing $at_desc ..." $at_traceon @@ -11950,14 +12415,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_47 -#AT_START_48 -at_fn_group_banner 48 'exclude15.at:36' \ +#AT_STOP_49 +#AT_START_50 +at_fn_group_banner 50 'exclude15.at:36' \ "--exclude-tag-all and --listed-incremental" " " 7 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "48. $at_setup_line: testing $at_desc ..." + $as_echo "50. $at_setup_line: testing $at_desc ..." $at_traceon @@ -12019,14 +12484,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_48 -#AT_START_49 -at_fn_group_banner 49 'exclude16.at:38' \ +#AT_STOP_50 +#AT_START_51 +at_fn_group_banner 51 'exclude16.at:38' \ "--exclude-tag-all option in incremental pass" " " 7 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "49. $at_setup_line: testing $at_desc ..." + $as_echo "51. $at_setup_line: testing $at_desc ..." $at_traceon @@ -12111,14 +12576,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_49 -#AT_START_50 -at_fn_group_banner 50 'delete01.at:23' \ +#AT_STOP_51 +#AT_START_52 +at_fn_group_banner 52 'delete01.at:23' \ "deleting a member after a big one" " " 8 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "50. $at_setup_line: testing $at_desc ..." + $as_echo "52. $at_setup_line: testing $at_desc ..." $at_traceon @@ -12337,14 +12802,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_50 -#AT_START_51 -at_fn_group_banner 51 'delete02.at:23' \ +#AT_STOP_52 +#AT_START_53 +at_fn_group_banner 53 'delete02.at:23' \ "deleting a member from stdin archive" " " 8 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "51. $at_setup_line: testing $at_desc ..." + $as_echo "53. $at_setup_line: testing $at_desc ..." $at_traceon @@ -12618,14 +13083,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_51 -#AT_START_52 -at_fn_group_banner 52 'delete03.at:21' \ +#AT_STOP_53 +#AT_START_54 +at_fn_group_banner 54 'delete03.at:21' \ "deleting members with long names" " " 8 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "52. $at_setup_line: testing $at_desc ..." + $as_echo "54. $at_setup_line: testing $at_desc ..." $at_traceon @@ -12816,14 +13281,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_52 -#AT_START_53 -at_fn_group_banner 53 'delete04.at:23' \ +#AT_STOP_54 +#AT_START_55 +at_fn_group_banner 55 'delete04.at:23' \ "deleting a large last member" " " 8 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "53. $at_setup_line: testing $at_desc ..." + $as_echo "55. $at_setup_line: testing $at_desc ..." $at_traceon @@ -13172,14 +13637,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_53 -#AT_START_54 -at_fn_group_banner 54 'delete05.at:27' \ +#AT_STOP_55 +#AT_START_56 +at_fn_group_banner 56 'delete05.at:27' \ "deleting non-existing member" " " 8 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "54. $at_setup_line: testing $at_desc ..." + $as_echo "56. $at_setup_line: testing $at_desc ..." $at_traceon @@ -13458,14 +13923,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_54 -#AT_START_55 -at_fn_group_banner 55 'extrac01.at:23' \ +#AT_STOP_56 +#AT_START_57 +at_fn_group_banner 57 'extrac01.at:23' \ "extract over an existing directory" " " 9 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "55. $at_setup_line: testing $at_desc ..." + $as_echo "57. $at_setup_line: testing $at_desc ..." $at_traceon @@ -13674,14 +14139,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_55 -#AT_START_56 -at_fn_group_banner 56 'extrac02.at:23' \ +#AT_STOP_57 +#AT_START_58 +at_fn_group_banner 58 'extrac02.at:23' \ "extracting symlinks over an existing file" " " 9 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "56. $at_setup_line: testing $at_desc ..." + $as_echo "58. $at_setup_line: testing $at_desc ..." $at_traceon @@ -13912,14 +14377,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_56 -#AT_START_57 -at_fn_group_banner 57 'extrac03.at:23' \ +#AT_STOP_58 +#AT_START_59 +at_fn_group_banner 59 'extrac03.at:23' \ "extraction loops" " " 9 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "57. $at_setup_line: testing $at_desc ..." + $as_echo "59. $at_setup_line: testing $at_desc ..." $at_traceon @@ -14138,14 +14603,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_57 -#AT_START_58 -at_fn_group_banner 58 'extrac04.at:23' \ +#AT_STOP_59 +#AT_START_60 +at_fn_group_banner 60 'extrac04.at:23' \ "extract + fnmatch" " " 9 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "58. $at_setup_line: testing $at_desc ..." + $as_echo "60. $at_setup_line: testing $at_desc ..." $at_traceon @@ -14484,14 +14949,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_58 -#AT_START_59 -at_fn_group_banner 59 'extrac05.at:30' \ +#AT_STOP_60 +#AT_START_61 +at_fn_group_banner 61 'extrac05.at:30' \ "extracting selected members from pax" " " 9 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "59. $at_setup_line: testing $at_desc ..." + $as_echo "61. $at_setup_line: testing $at_desc ..." $at_traceon @@ -14573,14 +15038,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_59 -#AT_START_60 -at_fn_group_banner 60 'extrac06.at:34' \ +#AT_STOP_61 +#AT_START_62 +at_fn_group_banner 62 'extrac06.at:34' \ "mode of extracted directories" " " 9 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "60. $at_setup_line: testing $at_desc ..." + $as_echo "62. $at_setup_line: testing $at_desc ..." $at_traceon @@ -15044,14 +15509,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_60 -#AT_START_61 -at_fn_group_banner 61 'extrac07.at:27' \ +#AT_STOP_62 +#AT_START_63 +at_fn_group_banner 63 'extrac07.at:27' \ "extracting symlinks to a read-only dir" " " 9 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "61. $at_setup_line: testing $at_desc ..." + $as_echo "63. $at_setup_line: testing $at_desc ..." $at_traceon @@ -15152,14 +15617,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_61 -#AT_START_62 -at_fn_group_banner 62 'extrac08.at:33' \ +#AT_STOP_63 +#AT_START_64 +at_fn_group_banner 64 'extrac08.at:33' \ "restoring mode on existing directory" " " 9 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "62. $at_setup_line: testing $at_desc ..." + $as_echo "64. $at_setup_line: testing $at_desc ..." $at_traceon @@ -15428,14 +15893,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_62 -#AT_START_63 -at_fn_group_banner 63 'extrac09.at:24' \ - "no need to save dir with unreadable . and .." " " 9 +#AT_STOP_64 +#AT_START_65 +at_fn_group_banner 65 'extrac09.at:34' \ + "extracting even when . and .. are unreadable" " " 9 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "63. $at_setup_line: testing $at_desc ..." + $as_echo "65. $at_setup_line: testing $at_desc ..." $at_traceon @@ -15443,7 +15908,7 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/extrac09.at:27: +$as_echo "$at_srcdir/extrac09.at:37: mkdir gnu (cd gnu TEST_TAR_FORMAT=gnu @@ -15476,7 +15941,7 @@ chmod a+r . .. cmp f extract/f || status=\$? exit \$status )" -at_fn_check_prepare_notrace 'an embedded newline' "extrac09.at:27" +at_fn_check_prepare_notrace 'an embedded newline' "extrac09.at:37" ( $at_check_trace; mkdir gnu (cd gnu @@ -15517,7 +15982,7 @@ at_fn_diff_devnull "$at_stderr" || at_failed=: echo >>"$at_stdout"; $as_echo "f " | \ $at_diff - "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/extrac09.at:27" +at_fn_check_status 0 $at_status "$at_srcdir/extrac09.at:37" $at_failed && at_fn_log_failure $at_traceon; } @@ -15528,14 +15993,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_63 -#AT_START_64 -at_fn_group_banner 64 'extrac10.at:29' \ +#AT_STOP_65 +#AT_START_66 +at_fn_group_banner 66 'extrac10.at:29' \ "-C and delayed setting of metadata" " " 9 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "64. $at_setup_line: testing $at_desc ..." + $as_echo "66. $at_setup_line: testing $at_desc ..." $at_traceon @@ -15596,14 +16061,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_64 -#AT_START_65 -at_fn_group_banner 65 'extrac11.at:25' \ +#AT_STOP_66 +#AT_START_67 +at_fn_group_banner 67 'extrac11.at:25' \ "scarce file descriptors" " " 9 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "65. $at_setup_line: testing $at_desc ..." + $as_echo "67. $at_setup_line: testing $at_desc ..." $at_traceon @@ -15756,14 +16221,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_65 -#AT_START_66 -at_fn_group_banner 66 'extrac12.at:25' \ +#AT_STOP_67 +#AT_START_68 +at_fn_group_banner 68 'extrac12.at:25' \ "extract dot permissions" " " 9 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "66. $at_setup_line: testing $at_desc ..." + $as_echo "68. $at_setup_line: testing $at_desc ..." $at_traceon @@ -15826,14 +16291,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_66 -#AT_START_67 -at_fn_group_banner 67 'extrac13.at:26' \ +#AT_STOP_68 +#AT_START_69 +at_fn_group_banner 69 'extrac13.at:26' \ "extract over symlinks" " " 9 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "67. $at_setup_line: testing $at_desc ..." + $as_echo "69. $at_setup_line: testing $at_desc ..." $at_traceon @@ -15922,14 +16387,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_67 -#AT_START_68 -at_fn_group_banner 68 'extrac14.at:25' \ +#AT_STOP_69 +#AT_START_70 +at_fn_group_banner 70 'extrac14.at:25' \ "extract -C symlink" " " 9 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "68. $at_setup_line: testing $at_desc ..." + $as_echo "70. $at_setup_line: testing $at_desc ..." $at_traceon @@ -15986,14 +16451,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_68 -#AT_START_69 -at_fn_group_banner 69 'extrac15.at:25' \ +#AT_STOP_70 +#AT_START_71 +at_fn_group_banner 71 'extrac15.at:25' \ "extract parent mkdir failure" " " 9 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "69. $at_setup_line: testing $at_desc ..." + $as_echo "71. $at_setup_line: testing $at_desc ..." $at_traceon @@ -16078,14 +16543,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_69 -#AT_START_70 -at_fn_group_banner 70 'extrac16.at:26' \ +#AT_STOP_71 +#AT_START_72 +at_fn_group_banner 72 'extrac16.at:26' \ "extract empty directory with -C" " " 9 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "70. $at_setup_line: testing $at_desc ..." + $as_echo "72. $at_setup_line: testing $at_desc ..." $at_traceon @@ -16140,14 +16605,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_70 -#AT_START_71 -at_fn_group_banner 71 'extrac17.at:21' \ +#AT_STOP_72 +#AT_START_73 +at_fn_group_banner 73 'extrac17.at:21' \ "name matching/transformation ordering" " " 9 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "71. $at_setup_line: testing $at_desc ..." + $as_echo "73. $at_setup_line: testing $at_desc ..." $at_traceon @@ -16416,14 +16881,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_71 -#AT_START_72 -at_fn_group_banner 72 'extrac18.at:34' \ +#AT_STOP_73 +#AT_START_74 +at_fn_group_banner 74 'extrac18.at:34' \ "keep-old-files" " " 9 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "72. $at_setup_line: testing $at_desc ..." + $as_echo "74. $at_setup_line: testing $at_desc ..." $at_traceon @@ -16762,14 +17227,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_72 -#AT_START_73 -at_fn_group_banner 73 'extrac19.at:21' \ +#AT_STOP_74 +#AT_START_75 +at_fn_group_banner 75 'extrac19.at:21' \ "skip-old-files" " " 9 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "73. $at_setup_line: testing $at_desc ..." + $as_echo "75. $at_setup_line: testing $at_desc ..." $at_traceon @@ -17093,14 +17558,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_73 -#AT_START_74 -at_fn_group_banner 74 'backup01.at:33' \ +#AT_STOP_75 +#AT_START_76 +at_fn_group_banner 76 'backup01.at:33' \ "extracting existing dir with --backup" " " 9 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "74. $at_setup_line: testing $at_desc ..." + $as_echo "76. $at_setup_line: testing $at_desc ..." $at_traceon @@ -17344,14 +17809,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_74 -#AT_START_75 -at_fn_group_banner 75 'label01.at:21' \ +#AT_STOP_76 +#AT_START_77 +at_fn_group_banner 77 'label01.at:21' \ "single-volume label" " " 10 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "75. $at_setup_line: testing $at_desc ..." + $as_echo "77. $at_setup_line: testing $at_desc ..." $at_traceon @@ -17494,14 +17959,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_75 -#AT_START_76 -at_fn_group_banner 76 'label02.at:21' \ +#AT_STOP_77 +#AT_START_78 +at_fn_group_banner 78 'label02.at:21' \ "multi-volume label" " " 10 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "76. $at_setup_line: testing $at_desc ..." + $as_echo "78. $at_setup_line: testing $at_desc ..." $at_traceon @@ -17659,14 +18124,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_76 -#AT_START_77 -at_fn_group_banner 77 'label03.at:27' \ +#AT_STOP_78 +#AT_START_79 +at_fn_group_banner 79 'label03.at:27' \ "test-label option" " " 10 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "77. $at_setup_line: testing $at_desc ..." + $as_echo "79. $at_setup_line: testing $at_desc ..." $at_traceon @@ -18004,14 +18469,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_77 -#AT_START_78 -at_fn_group_banner 78 'label04.at:27' \ +#AT_STOP_79 +#AT_START_80 +at_fn_group_banner 80 'label04.at:27' \ "label with non-create option" " " 10 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "78. $at_setup_line: testing $at_desc ..." + $as_echo "80. $at_setup_line: testing $at_desc ..." $at_traceon @@ -18199,14 +18664,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_78 -#AT_START_79 -at_fn_group_banner 79 'label05.at:24' \ +#AT_STOP_80 +#AT_START_81 +at_fn_group_banner 81 'label05.at:24' \ "label with non-create option" " " 10 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "79. $at_setup_line: testing $at_desc ..." + $as_echo "81. $at_setup_line: testing $at_desc ..." $at_traceon @@ -18394,14 +18859,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_79 -#AT_START_80 -at_fn_group_banner 80 'incremental.at:23' \ +#AT_STOP_81 +#AT_START_82 +at_fn_group_banner 82 'incremental.at:23' \ "incremental" " " 11 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "80. $at_setup_line: testing $at_desc ..." + $as_echo "82. $at_setup_line: testing $at_desc ..." $at_traceon @@ -18679,14 +19144,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_80 -#AT_START_81 -at_fn_group_banner 81 'incr01.at:27' \ +#AT_STOP_82 +#AT_START_83 +at_fn_group_banner 83 'incr01.at:27' \ "restore broken symlinks from incremental" " " 11 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "81. $at_setup_line: testing $at_desc ..." + $as_echo "83. $at_setup_line: testing $at_desc ..." $at_traceon @@ -18883,14 +19348,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_81 -#AT_START_82 -at_fn_group_banner 82 'incr02.at:32' \ +#AT_STOP_83 +#AT_START_84 +at_fn_group_banner 84 'incr02.at:32' \ "restoring timestamps from incremental" " " 11 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "82. $at_setup_line: testing $at_desc ..." + $as_echo "84. $at_setup_line: testing $at_desc ..." $at_traceon @@ -19207,14 +19672,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_82 -#AT_START_83 -at_fn_group_banner 83 'listed01.at:26' \ +#AT_STOP_84 +#AT_START_85 +at_fn_group_banner 85 'listed01.at:26' \ "--listed for individual files" " " 11 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "83. $at_setup_line: testing $at_desc ..." + $as_echo "85. $at_setup_line: testing $at_desc ..." $at_traceon @@ -19394,14 +19859,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_83 -#AT_START_84 -at_fn_group_banner 84 'listed02.at:28' \ +#AT_STOP_85 +#AT_START_86 +at_fn_group_banner 86 'listed02.at:28' \ "working --listed" " " 11 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "84. $at_setup_line: testing $at_desc ..." + $as_echo "86. $at_setup_line: testing $at_desc ..." $at_traceon @@ -19839,14 +20304,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_84 -#AT_START_85 -at_fn_group_banner 85 'listed03.at:24' \ +#AT_STOP_86 +#AT_START_87 +at_fn_group_banner 87 'listed03.at:24' \ "incremental dump when the parent directory is unreadable" "" 11 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "85. $at_setup_line: testing $at_desc ..." + $as_echo "87. $at_setup_line: testing $at_desc ..." $at_traceon @@ -19936,14 +20401,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_85 -#AT_START_86 -at_fn_group_banner 86 'listed04.at:26' \ +#AT_STOP_87 +#AT_START_88 +at_fn_group_banner 88 'listed04.at:26' \ "--listed-incremental and --one-file-system" " " 11 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "86. $at_setup_line: testing $at_desc ..." + $as_echo "88. $at_setup_line: testing $at_desc ..." $at_traceon @@ -20011,14 +20476,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_86 -#AT_START_87 -at_fn_group_banner 87 'listed05.at:33' \ +#AT_STOP_88 +#AT_START_89 +at_fn_group_banner 89 'listed05.at:33' \ "--listed-incremental and remounted directories" " " 11 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "87. $at_setup_line: testing $at_desc ..." + $as_echo "89. $at_setup_line: testing $at_desc ..." $at_traceon @@ -20139,14 +20604,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_87 -#AT_START_88 -at_fn_group_banner 88 'incr03.at:28' \ +#AT_STOP_89 +#AT_START_90 +at_fn_group_banner 90 'incr03.at:28' \ "renamed files in incrementals" " " 11 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "88. $at_setup_line: testing $at_desc ..." + $as_echo "90. $at_setup_line: testing $at_desc ..." $at_traceon @@ -20475,14 +20940,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_88 -#AT_START_89 -at_fn_group_banner 89 'incr04.at:29' \ +#AT_STOP_90 +#AT_START_91 +at_fn_group_banner 91 'incr04.at:29' \ "proper icontents initialization" " " 11 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "89. $at_setup_line: testing $at_desc ..." + $as_echo "91. $at_setup_line: testing $at_desc ..." $at_traceon @@ -21135,14 +21600,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_89 -#AT_START_90 -at_fn_group_banner 90 'incr05.at:21' \ +#AT_STOP_91 +#AT_START_92 +at_fn_group_banner 92 'incr05.at:21' \ "incremental dumps with -C" " " 11 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "90. $at_setup_line: testing $at_desc ..." + $as_echo "92. $at_setup_line: testing $at_desc ..." $at_traceon @@ -21345,14 +21810,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_90 -#AT_START_91 -at_fn_group_banner 91 'incr06.at:21' \ +#AT_STOP_92 +#AT_START_93 +at_fn_group_banner 93 'incr06.at:21' \ "incremental dumps of nested directories" " " 11 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "91. $at_setup_line: testing $at_desc ..." + $as_echo "93. $at_setup_line: testing $at_desc ..." $at_traceon @@ -21672,14 +22137,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_91 -#AT_START_92 -at_fn_group_banner 92 'incr07.at:18' \ +#AT_STOP_93 +#AT_START_94 +at_fn_group_banner 94 'incr07.at:18' \ "incremental restores with -C" " " 11 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "92. $at_setup_line: testing $at_desc ..." + $as_echo "94. $at_setup_line: testing $at_desc ..." $at_traceon @@ -21715,23 +22180,23 @@ TAR_OPTIONS=\"-H gnu\" export TAR_OPTIONS rm -rf * -mkdir A -echo 'a' > A/a -echo 'a' > A/b +mkdir dirA +echo 'a' > dirA/a +echo 'a' > dirA/b decho C0 -tar -g test.snar -vcf test.0.tar A +tar -g test.snar -vcf test.0.tar dirA -echo 'a' > A/c +echo 'a' > dirA/c decho C1 -tar -g test.snar -vcf test.1.tar A +tar -g test.snar -vcf test.1.tar dirA -rm -f A/a +rm -f dirA/a decho C2 -tar -g test.snar -vcf test.2.tar A +tar -g test.snar -vcf test.2.tar dirA mkdir ext -rm -rf A +rm -rf dirA decho E0 tar -g test.snar -vxf test.0.tar -C ext/ @@ -21741,14 +22206,14 @@ tar -g test.snar -vxf test.1.tar -C ext/ decho E2 tar -g test.snar -vxf test.2.tar -C ext/ -mkdir ext/A/B -touch ext/A/B/file +mkdir ext/dirA/dirB +touch ext/dirA/dirB/file decho E3 tar -g test.snar -vxf test.2.tar -C ext/ echo FIN -test -d A && echo >&2 \"toplevel A exists\" +test -d dirA && echo >&2 \"toplevel dirA exists\" exit 0 )" at_fn_check_prepare_notrace 'an embedded newline' "incr07.at:40" @@ -21761,23 +22226,23 @@ TAR_OPTIONS="-H gnu" export TAR_OPTIONS rm -rf * -mkdir A -echo 'a' > A/a -echo 'a' > A/b +mkdir dirA +echo 'a' > dirA/a +echo 'a' > dirA/b decho C0 -tar -g test.snar -vcf test.0.tar A +tar -g test.snar -vcf test.0.tar dirA -echo 'a' > A/c +echo 'a' > dirA/c decho C1 -tar -g test.snar -vcf test.1.tar A +tar -g test.snar -vcf test.1.tar dirA -rm -f A/a +rm -f dirA/a decho C2 -tar -g test.snar -vcf test.2.tar A +tar -g test.snar -vcf test.2.tar dirA mkdir ext -rm -rf A +rm -rf dirA decho E0 tar -g test.snar -vxf test.0.tar -C ext/ @@ -21787,21 +22252,21 @@ tar -g test.snar -vxf test.1.tar -C ext/ decho E2 tar -g test.snar -vxf test.2.tar -C ext/ -mkdir ext/A/B -touch ext/A/B/file +mkdir ext/dirA/dirB +touch ext/dirA/dirB/file decho E3 tar -g test.snar -vxf test.2.tar -C ext/ echo FIN -test -d A && echo >&2 "toplevel A exists" +test -d dirA && echo >&2 "toplevel dirA exists" exit 0 ) ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo >>"$at_stderr"; $as_echo "C0 -tar: A: Directory is new +tar: dirA: Directory is new C1 C2 E0 @@ -21811,27 +22276,27 @@ E3 " | \ $at_diff - "$at_stderr" || at_failed=: echo >>"$at_stdout"; $as_echo "C0 -A/ -A/a -A/b +dirA/ +dirA/a +dirA/b C1 -A/ -A/c +dirA/ +dirA/c C2 -A/ +dirA/ E0 -A/ -A/a -A/b +dirA/ +dirA/a +dirA/b E1 -A/ -A/c +dirA/ +dirA/c E2 -A/ -tar: Deleting 'A/a' +dirA/ +tar: Deleting 'dirA/a' E3 -A/ -tar: Deleting 'A/B' +dirA/ +tar: Deleting 'dirA/dirB' FIN " | \ $at_diff - "$at_stdout" || at_failed=: @@ -21849,23 +22314,23 @@ TAR_OPTIONS=\"-H oldgnu\" export TAR_OPTIONS rm -rf * -mkdir A -echo 'a' > A/a -echo 'a' > A/b +mkdir dirA +echo 'a' > dirA/a +echo 'a' > dirA/b decho C0 -tar -g test.snar -vcf test.0.tar A +tar -g test.snar -vcf test.0.tar dirA -echo 'a' > A/c +echo 'a' > dirA/c decho C1 -tar -g test.snar -vcf test.1.tar A +tar -g test.snar -vcf test.1.tar dirA -rm -f A/a +rm -f dirA/a decho C2 -tar -g test.snar -vcf test.2.tar A +tar -g test.snar -vcf test.2.tar dirA mkdir ext -rm -rf A +rm -rf dirA decho E0 tar -g test.snar -vxf test.0.tar -C ext/ @@ -21875,14 +22340,14 @@ tar -g test.snar -vxf test.1.tar -C ext/ decho E2 tar -g test.snar -vxf test.2.tar -C ext/ -mkdir ext/A/B -touch ext/A/B/file +mkdir ext/dirA/dirB +touch ext/dirA/dirB/file decho E3 tar -g test.snar -vxf test.2.tar -C ext/ echo FIN -test -d A && echo >&2 \"toplevel A exists\" +test -d dirA && echo >&2 \"toplevel dirA exists\" exit 0 )" at_fn_check_prepare_notrace 'an embedded newline' "incr07.at:40" @@ -21895,23 +22360,23 @@ TAR_OPTIONS="-H oldgnu" export TAR_OPTIONS rm -rf * -mkdir A -echo 'a' > A/a -echo 'a' > A/b +mkdir dirA +echo 'a' > dirA/a +echo 'a' > dirA/b decho C0 -tar -g test.snar -vcf test.0.tar A +tar -g test.snar -vcf test.0.tar dirA -echo 'a' > A/c +echo 'a' > dirA/c decho C1 -tar -g test.snar -vcf test.1.tar A +tar -g test.snar -vcf test.1.tar dirA -rm -f A/a +rm -f dirA/a decho C2 -tar -g test.snar -vcf test.2.tar A +tar -g test.snar -vcf test.2.tar dirA mkdir ext -rm -rf A +rm -rf dirA decho E0 tar -g test.snar -vxf test.0.tar -C ext/ @@ -21921,21 +22386,21 @@ tar -g test.snar -vxf test.1.tar -C ext/ decho E2 tar -g test.snar -vxf test.2.tar -C ext/ -mkdir ext/A/B -touch ext/A/B/file +mkdir ext/dirA/dirB +touch ext/dirA/dirB/file decho E3 tar -g test.snar -vxf test.2.tar -C ext/ echo FIN -test -d A && echo >&2 "toplevel A exists" +test -d dirA && echo >&2 "toplevel dirA exists" exit 0 ) ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo >>"$at_stderr"; $as_echo "C0 -tar: A: Directory is new +tar: dirA: Directory is new C1 C2 E0 @@ -21945,27 +22410,27 @@ E3 " | \ $at_diff - "$at_stderr" || at_failed=: echo >>"$at_stdout"; $as_echo "C0 -A/ -A/a -A/b +dirA/ +dirA/a +dirA/b C1 -A/ -A/c +dirA/ +dirA/c C2 -A/ +dirA/ E0 -A/ -A/a -A/b +dirA/ +dirA/a +dirA/b E1 -A/ -A/c +dirA/ +dirA/c E2 -A/ -tar: Deleting 'A/a' +dirA/ +tar: Deleting 'dirA/a' E3 -A/ -tar: Deleting 'A/B' +dirA/ +tar: Deleting 'dirA/dirB' FIN " | \ $at_diff - "$at_stdout" || at_failed=: @@ -21983,23 +22448,23 @@ TAR_OPTIONS=\"-H posix\" export TAR_OPTIONS rm -rf * -mkdir A -echo 'a' > A/a -echo 'a' > A/b +mkdir dirA +echo 'a' > dirA/a +echo 'a' > dirA/b decho C0 -tar -g test.snar -vcf test.0.tar A +tar -g test.snar -vcf test.0.tar dirA -echo 'a' > A/c +echo 'a' > dirA/c decho C1 -tar -g test.snar -vcf test.1.tar A +tar -g test.snar -vcf test.1.tar dirA -rm -f A/a +rm -f dirA/a decho C2 -tar -g test.snar -vcf test.2.tar A +tar -g test.snar -vcf test.2.tar dirA mkdir ext -rm -rf A +rm -rf dirA decho E0 tar -g test.snar -vxf test.0.tar -C ext/ @@ -22009,14 +22474,14 @@ tar -g test.snar -vxf test.1.tar -C ext/ decho E2 tar -g test.snar -vxf test.2.tar -C ext/ -mkdir ext/A/B -touch ext/A/B/file +mkdir ext/dirA/dirB +touch ext/dirA/dirB/file decho E3 tar -g test.snar -vxf test.2.tar -C ext/ echo FIN -test -d A && echo >&2 \"toplevel A exists\" +test -d dirA && echo >&2 \"toplevel dirA exists\" exit 0 )" at_fn_check_prepare_notrace 'an embedded newline' "incr07.at:40" @@ -22029,23 +22494,23 @@ TAR_OPTIONS="-H posix" export TAR_OPTIONS rm -rf * -mkdir A -echo 'a' > A/a -echo 'a' > A/b +mkdir dirA +echo 'a' > dirA/a +echo 'a' > dirA/b decho C0 -tar -g test.snar -vcf test.0.tar A +tar -g test.snar -vcf test.0.tar dirA -echo 'a' > A/c +echo 'a' > dirA/c decho C1 -tar -g test.snar -vcf test.1.tar A +tar -g test.snar -vcf test.1.tar dirA -rm -f A/a +rm -f dirA/a decho C2 -tar -g test.snar -vcf test.2.tar A +tar -g test.snar -vcf test.2.tar dirA mkdir ext -rm -rf A +rm -rf dirA decho E0 tar -g test.snar -vxf test.0.tar -C ext/ @@ -22055,21 +22520,21 @@ tar -g test.snar -vxf test.1.tar -C ext/ decho E2 tar -g test.snar -vxf test.2.tar -C ext/ -mkdir ext/A/B -touch ext/A/B/file +mkdir ext/dirA/dirB +touch ext/dirA/dirB/file decho E3 tar -g test.snar -vxf test.2.tar -C ext/ echo FIN -test -d A && echo >&2 "toplevel A exists" +test -d dirA && echo >&2 "toplevel dirA exists" exit 0 ) ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo >>"$at_stderr"; $as_echo "C0 -tar: A: Directory is new +tar: dirA: Directory is new C1 C2 E0 @@ -22079,27 +22544,27 @@ E3 " | \ $at_diff - "$at_stderr" || at_failed=: echo >>"$at_stdout"; $as_echo "C0 -A/ -A/a -A/b +dirA/ +dirA/a +dirA/b C1 -A/ -A/c +dirA/ +dirA/c C2 -A/ +dirA/ E0 -A/ -A/a -A/b +dirA/ +dirA/a +dirA/b E1 -A/ -A/c +dirA/ +dirA/c E2 -A/ -tar: Deleting 'A/a' +dirA/ +tar: Deleting 'dirA/a' E3 -A/ -tar: Deleting 'A/B' +dirA/ +tar: Deleting 'dirA/dirB' FIN " | \ $at_diff - "$at_stdout" || at_failed=: @@ -22114,14 +22579,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_92 -#AT_START_93 -at_fn_group_banner 93 'incr08.at:38' \ +#AT_STOP_94 +#AT_START_95 +at_fn_group_banner 95 'incr08.at:38' \ "filename normalization" " " 11 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "93. $at_setup_line: testing $at_desc ..." + $as_echo "95. $at_setup_line: testing $at_desc ..." $at_traceon @@ -22227,14 +22692,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_93 -#AT_START_94 -at_fn_group_banner 94 'incr09.at:26' \ +#AT_STOP_95 +#AT_START_96 +at_fn_group_banner 96 'incr09.at:26' \ "incremental with alternating -C" " " 11 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "94. $at_setup_line: testing $at_desc ..." + $as_echo "96. $at_setup_line: testing $at_desc ..." $at_traceon @@ -22329,14 +22794,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_94 -#AT_START_95 -at_fn_group_banner 95 'filerem01.at:36' \ +#AT_STOP_96 +#AT_START_97 +at_fn_group_banner 97 'filerem01.at:36' \ "file removed as we read it (ca. 22 seconds)" " " 12 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "95. $at_setup_line: testing $at_desc ..." + $as_echo "97. $at_setup_line: testing $at_desc ..." $at_traceon @@ -22501,14 +22966,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_95 -#AT_START_96 -at_fn_group_banner 96 'filerem02.at:26' \ +#AT_STOP_97 +#AT_START_98 +at_fn_group_banner 98 'filerem02.at:26' \ "toplevel file removed (ca. 24 seconds)" " " 12 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "96. $at_setup_line: testing $at_desc ..." + $as_echo "98. $at_setup_line: testing $at_desc ..." $at_traceon @@ -22633,14 +23098,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_96 -#AT_START_97 -at_fn_group_banner 97 'rename01.at:24' \ +#AT_STOP_98 +#AT_START_99 +at_fn_group_banner 99 'rename01.at:24' \ "renamed dirs in incrementals" " " 13 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "97. $at_setup_line: testing $at_desc ..." + $as_echo "99. $at_setup_line: testing $at_desc ..." $at_traceon @@ -23011,14 +23476,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_97 -#AT_START_98 -at_fn_group_banner 98 'rename02.at:24' \ +#AT_STOP_99 +#AT_START_100 +at_fn_group_banner 100 'rename02.at:24' \ "move between hierarchies" " " 13 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "98. $at_setup_line: testing $at_desc ..." + $as_echo "100. $at_setup_line: testing $at_desc ..." $at_traceon @@ -23446,14 +23911,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_98 -#AT_START_99 -at_fn_group_banner 99 'rename03.at:23' \ +#AT_STOP_100 +#AT_START_101 +at_fn_group_banner 101 'rename03.at:23' \ "cyclic renames" " " 13 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "99. $at_setup_line: testing $at_desc ..." + $as_echo "101. $at_setup_line: testing $at_desc ..." $at_traceon @@ -23992,14 +24457,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_99 -#AT_START_100 -at_fn_group_banner 100 'rename04.at:27' \ +#AT_STOP_101 +#AT_START_102 +at_fn_group_banner 102 'rename04.at:27' \ "renamed directory containing subdirectories" " " 13 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "100. $at_setup_line: testing $at_desc ..." + $as_echo "102. $at_setup_line: testing $at_desc ..." $at_traceon @@ -24331,14 +24796,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_100 -#AT_START_101 -at_fn_group_banner 101 'rename05.at:24' \ +#AT_STOP_102 +#AT_START_103 +at_fn_group_banner 103 'rename05.at:24' \ "renamed subdirectories" " " 13 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "101. $at_setup_line: testing $at_desc ..." + $as_echo "103. $at_setup_line: testing $at_desc ..." $at_traceon @@ -24676,14 +25141,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_101 -#AT_START_102 -at_fn_group_banner 102 'chtype.at:27' \ +#AT_STOP_103 +#AT_START_104 +at_fn_group_banner 104 'chtype.at:27' \ "changed file types in incrementals" " " 13 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "102. $at_setup_line: testing $at_desc ..." + $as_echo "104. $at_setup_line: testing $at_desc ..." $at_traceon @@ -25000,14 +25465,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_102 -#AT_START_103 -at_fn_group_banner 103 'ignfail.at:23' \ +#AT_STOP_104 +#AT_START_105 +at_fn_group_banner 105 'ignfail.at:23' \ "ignfail" " " 14 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "103. $at_setup_line: testing $at_desc ..." + $as_echo "105. $at_setup_line: testing $at_desc ..." $at_traceon @@ -25641,14 +26106,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_103 -#AT_START_104 -at_fn_group_banner 104 'link01.at:33' \ +#AT_STOP_105 +#AT_START_106 +at_fn_group_banner 106 'link01.at:33' \ "link count gt 2" " " 15 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "104. $at_setup_line: testing $at_desc ..." + $as_echo "106. $at_setup_line: testing $at_desc ..." $at_traceon @@ -25957,14 +26422,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_104 -#AT_START_105 -at_fn_group_banner 105 'link02.at:32' \ +#AT_STOP_106 +#AT_START_107 +at_fn_group_banner 107 'link02.at:32' \ "preserve hard links with --remove-files" " " 15 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "105. $at_setup_line: testing $at_desc ..." + $as_echo "107. $at_setup_line: testing $at_desc ..." $at_traceon @@ -26213,14 +26678,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_105 -#AT_START_106 -at_fn_group_banner 106 'link03.at:24' \ +#AT_STOP_107 +#AT_START_108 +at_fn_group_banner 108 'link03.at:24' \ "working -l with --remove-files" " " 15 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "106. $at_setup_line: testing $at_desc ..." + $as_echo "108. $at_setup_line: testing $at_desc ..." $at_traceon @@ -26612,14 +27077,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_106 -#AT_START_107 -at_fn_group_banner 107 'link04.at:29' \ +#AT_STOP_108 +#AT_START_109 +at_fn_group_banner 109 'link04.at:29' \ "link count is 1 but multiple occurrences" " " 15 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "107. $at_setup_line: testing $at_desc ..." + $as_echo "109. $at_setup_line: testing $at_desc ..." $at_traceon @@ -27013,14 +27478,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_107 -#AT_START_108 -at_fn_group_banner 108 'longv7.at:24' \ +#AT_STOP_109 +#AT_START_110 +at_fn_group_banner 110 'longv7.at:24' \ "long names in V7 archives" " " 16 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "108. $at_setup_line: testing $at_desc ..." + $as_echo "110. $at_setup_line: testing $at_desc ..." $at_traceon @@ -27088,14 +27553,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_108 -#AT_START_109 -at_fn_group_banner 109 'long01.at:28' \ +#AT_STOP_110 +#AT_START_111 +at_fn_group_banner 111 'long01.at:28' \ "long file names divisible by block size" " " 16 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "109. $at_setup_line: testing $at_desc ..." + $as_echo "111. $at_setup_line: testing $at_desc ..." $at_traceon @@ -27203,14 +27668,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_109 -#AT_START_110 -at_fn_group_banner 110 'lustar01.at:21' \ +#AT_STOP_111 +#AT_START_112 +at_fn_group_banner 112 'lustar01.at:21' \ "ustar: unsplittable file name" " " 16 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "110. $at_setup_line: testing $at_desc ..." + $as_echo "112. $at_setup_line: testing $at_desc ..." $at_traceon @@ -27265,14 +27730,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_110 -#AT_START_111 -at_fn_group_banner 111 'lustar02.at:21' \ +#AT_STOP_112 +#AT_START_113 +at_fn_group_banner 113 'lustar02.at:21' \ "ustar: unsplittable path name" " " 16 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "111. $at_setup_line: testing $at_desc ..." + $as_echo "113. $at_setup_line: testing $at_desc ..." $at_traceon @@ -27336,14 +27801,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_111 -#AT_START_112 -at_fn_group_banner 112 'lustar03.at:21' \ +#AT_STOP_113 +#AT_START_114 +at_fn_group_banner 114 'lustar03.at:21' \ "ustar: splitting long names" " " 16 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "112. $at_setup_line: testing $at_desc ..." + $as_echo "114. $at_setup_line: testing $at_desc ..." $at_traceon @@ -27409,13 +27874,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_112 -#AT_START_113 -at_fn_group_banner 113 'old.at:23' \ +#AT_STOP_114 +#AT_START_115 +at_fn_group_banner 115 'old.at:23' \ "old archives" " " 16 at_xfail=no ( - $as_echo "113. $at_setup_line: testing $at_desc ..." + $as_echo "115. $at_setup_line: testing $at_desc ..." $at_traceon @@ -27450,14 +27915,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_113 -#AT_START_114 -at_fn_group_banner 114 'time01.at:20' \ +#AT_STOP_115 +#AT_START_116 +at_fn_group_banner 116 'time01.at:20' \ "time: tricky time stamps" " " 16 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "114. $at_setup_line: testing $at_desc ..." + $as_echo "116. $at_setup_line: testing $at_desc ..." $at_traceon @@ -27584,14 +28049,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_114 -#AT_START_115 -at_fn_group_banner 115 'multiv01.at:23' \ +#AT_STOP_116 +#AT_START_117 +at_fn_group_banner 117 'multiv01.at:24' \ "multivolume dumps from pipes" " " 17 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "115. $at_setup_line: testing $at_desc ..." + $as_echo "117. $at_setup_line: testing $at_desc ..." $at_traceon @@ -27603,7 +28068,7 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/multiv01.at:30: +$as_echo "$at_srcdir/multiv01.at:31: mkdir gnu (cd gnu TEST_TAR_FORMAT=gnu @@ -27641,7 +28106,7 @@ PATH=\$PATH \${TRUSS} tar -f t1-pipe.tar -f - \\ cmp file1 extract-dir-pipe/file1 cmp file2 extract-dir-pipe/file2 )" -at_fn_check_prepare_notrace 'a ${...} parameter expansion' "multiv01.at:30" +at_fn_check_prepare_notrace 'a ${...} parameter expansion' "multiv01.at:31" ( $at_check_trace; mkdir gnu (cd gnu @@ -27685,12 +28150,12 @@ at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/multiv01.at:30" +at_fn_check_status 0 $at_status "$at_srcdir/multiv01.at:31" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/multiv01.at:30: +$as_echo "$at_srcdir/multiv01.at:31: mkdir oldgnu (cd oldgnu TEST_TAR_FORMAT=oldgnu @@ -27728,7 +28193,7 @@ PATH=\$PATH \${TRUSS} tar -f t1-pipe.tar -f - \\ cmp file1 extract-dir-pipe/file1 cmp file2 extract-dir-pipe/file2 )" -at_fn_check_prepare_notrace 'a ${...} parameter expansion' "multiv01.at:30" +at_fn_check_prepare_notrace 'a ${...} parameter expansion' "multiv01.at:31" ( $at_check_trace; mkdir oldgnu (cd oldgnu @@ -27772,12 +28237,12 @@ at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/multiv01.at:30" +at_fn_check_status 0 $at_status "$at_srcdir/multiv01.at:31" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/multiv01.at:30: +$as_echo "$at_srcdir/multiv01.at:31: mkdir pax (cd pax TEST_TAR_FORMAT=pax @@ -27815,7 +28280,7 @@ PATH=\$PATH \${TRUSS} tar -f t1-pipe.tar -f - \\ cmp file1 extract-dir-pipe/file1 cmp file2 extract-dir-pipe/file2 )" -at_fn_check_prepare_notrace 'a ${...} parameter expansion' "multiv01.at:30" +at_fn_check_prepare_notrace 'a ${...} parameter expansion' "multiv01.at:31" ( $at_check_trace; mkdir pax (cd pax @@ -27859,7 +28324,7 @@ at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: at_fn_diff_devnull "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/multiv01.at:30" +at_fn_check_status 0 $at_status "$at_srcdir/multiv01.at:31" $at_failed && at_fn_log_failure $at_traceon; } @@ -27870,14 +28335,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_115 -#AT_START_116 -at_fn_group_banner 116 'multiv02.at:28' \ +#AT_STOP_117 +#AT_START_118 +at_fn_group_banner 118 'multiv02.at:28' \ "skipping a straddling member" " " 17 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "116. $at_setup_line: testing $at_desc ..." + $as_echo "118. $at_setup_line: testing $at_desc ..." $at_traceon @@ -28053,14 +28518,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_116 -#AT_START_117 -at_fn_group_banner 117 'multiv03.at:30' \ +#AT_STOP_118 +#AT_START_119 +at_fn_group_banner 119 'multiv03.at:30' \ "MV archive & long filenames" " " 17 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "117. $at_setup_line: testing $at_desc ..." + $as_echo "119. $at_setup_line: testing $at_desc ..." $at_traceon @@ -28256,14 +28721,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_117 -#AT_START_118 -at_fn_group_banner 118 'multiv04.at:36' \ +#AT_STOP_119 +#AT_START_120 +at_fn_group_banner 120 'multiv04.at:36' \ "split directory members in a MV archive" " " 17 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "118. $at_setup_line: testing $at_desc ..." + $as_echo "120. $at_setup_line: testing $at_desc ..." $at_traceon @@ -28413,14 +28878,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_118 -#AT_START_119 -at_fn_group_banner 119 'multiv05.at:26' \ +#AT_STOP_120 +#AT_START_121 +at_fn_group_banner 121 'multiv05.at:26' \ "Restoring after an out of sync volume" " " 17 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "119. $at_setup_line: testing $at_desc ..." + $as_echo "121. $at_setup_line: testing $at_desc ..." $at_traceon @@ -28540,14 +29005,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_119 -#AT_START_120 -at_fn_group_banner 120 'multiv06.at:27' \ +#AT_STOP_121 +#AT_START_122 +at_fn_group_banner 122 'multiv06.at:27' \ "Multivolumes with L=record_size" " " 17 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "120. $at_setup_line: testing $at_desc ..." + $as_echo "122. $at_setup_line: testing $at_desc ..." $at_traceon @@ -28665,14 +29130,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_120 -#AT_START_121 -at_fn_group_banner 121 'multiv07.at:28' \ +#AT_STOP_122 +#AT_START_123 +at_fn_group_banner 123 'multiv07.at:28' \ "volumes split at an extended header" " " 17 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "121. $at_setup_line: testing $at_desc ..." + $as_echo "123. $at_setup_line: testing $at_desc ..." $at_traceon @@ -28725,14 +29190,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_121 -#AT_START_122 -at_fn_group_banner 122 'multiv08.at:25' \ +#AT_STOP_123 +#AT_START_124 +at_fn_group_banner 124 'multiv08.at:25' \ "multivolume header creation" " " 17 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "122. $at_setup_line: testing $at_desc ..." + $as_echo "124. $at_setup_line: testing $at_desc ..." $at_traceon @@ -28798,14 +29263,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_122 -#AT_START_123 -at_fn_group_banner 123 'owner.at:21' \ +#AT_STOP_124 +#AT_START_125 +at_fn_group_banner 125 'owner.at:21' \ "--owner and --group" " " 18 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "123. $at_setup_line: testing $at_desc ..." + $as_echo "125. $at_setup_line: testing $at_desc ..." $at_traceon @@ -28877,14 +29342,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_123 -#AT_START_124 -at_fn_group_banner 124 'sparse01.at:21' \ +#AT_STOP_125 +#AT_START_126 +at_fn_group_banner 126 'sparse01.at:21' \ "sparse files" " " 19 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "124. $at_setup_line: testing $at_desc ..." + $as_echo "126. $at_setup_line: testing $at_desc ..." $at_traceon @@ -29081,14 +29546,14 @@ done $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_124 -#AT_START_125 -at_fn_group_banner 125 'sparse02.at:21' \ +#AT_STOP_126 +#AT_START_127 +at_fn_group_banner 127 'sparse02.at:21' \ "extracting sparse file over a pipe" " " 19 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "125. $at_setup_line: testing $at_desc ..." + $as_echo "127. $at_setup_line: testing $at_desc ..." $at_traceon @@ -29241,14 +29706,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_125 -#AT_START_126 -at_fn_group_banner 126 'sparse03.at:21' \ +#AT_STOP_127 +#AT_START_128 +at_fn_group_banner 128 'sparse03.at:21' \ "storing sparse files > 8G" " " 19 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "126. $at_setup_line: testing $at_desc ..." + $as_echo "128. $at_setup_line: testing $at_desc ..." $at_traceon @@ -29340,14 +29805,14 @@ done $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_126 -#AT_START_127 -at_fn_group_banner 127 'sparse04.at:21' \ +#AT_STOP_128 +#AT_START_129 +at_fn_group_banner 129 'sparse04.at:21' \ "storing long sparse file names" " " 19 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "127. $at_setup_line: testing $at_desc ..." + $as_echo "129. $at_setup_line: testing $at_desc ..." $at_traceon @@ -29409,14 +29874,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_127 -#AT_START_128 -at_fn_group_banner 128 'sparsemv.at:21' \ +#AT_STOP_129 +#AT_START_130 +at_fn_group_banner 130 'sparsemv.at:21' \ "sparse files in MV archives" " " 19 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "128. $at_setup_line: testing $at_desc ..." + $as_echo "130. $at_setup_line: testing $at_desc ..." $at_traceon @@ -29593,14 +30058,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_128 -#AT_START_129 -at_fn_group_banner 129 'spmvp00.at:21' \ +#AT_STOP_130 +#AT_START_131 +at_fn_group_banner 131 'spmvp00.at:21' \ "sparse files in PAX MV archives, v.0.0" " " 19 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "129. $at_setup_line: testing $at_desc ..." + $as_echo "131. $at_setup_line: testing $at_desc ..." $at_traceon @@ -29693,14 +30158,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_129 -#AT_START_130 -at_fn_group_banner 130 'spmvp01.at:21' \ +#AT_STOP_131 +#AT_START_132 +at_fn_group_banner 132 'spmvp01.at:21' \ "sparse files in PAX MV archives, v.0.1" " " 19 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "130. $at_setup_line: testing $at_desc ..." + $as_echo "132. $at_setup_line: testing $at_desc ..." $at_traceon @@ -29793,14 +30258,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_130 -#AT_START_131 -at_fn_group_banner 131 'spmvp10.at:21' \ +#AT_STOP_132 +#AT_START_133 +at_fn_group_banner 133 'spmvp10.at:21' \ "sparse files in PAX MV archives, v.1.0" " " 19 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "131. $at_setup_line: testing $at_desc ..." + $as_echo "133. $at_setup_line: testing $at_desc ..." $at_traceon @@ -29893,14 +30358,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_131 -#AT_START_132 -at_fn_group_banner 132 'update.at:28' \ +#AT_STOP_133 +#AT_START_134 +at_fn_group_banner 134 'update.at:28' \ "update unchanged directories" " " 20 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "132. $at_setup_line: testing $at_desc ..." + $as_echo "134. $at_setup_line: testing $at_desc ..." $at_traceon @@ -30219,14 +30684,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_132 -#AT_START_133 -at_fn_group_banner 133 'update01.at:29' \ +#AT_STOP_134 +#AT_START_135 +at_fn_group_banner 135 'update01.at:29' \ "update directories" " " 20 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "133. $at_setup_line: testing $at_desc ..." + $as_echo "135. $at_setup_line: testing $at_desc ..." $at_traceon @@ -30590,14 +31055,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_133 -#AT_START_134 -at_fn_group_banner 134 'update02.at:26' \ +#AT_STOP_135 +#AT_START_136 +at_fn_group_banner 136 'update02.at:26' \ "update changed files" " " 20 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "134. $at_setup_line: testing $at_desc ..." + $as_echo "136. $at_setup_line: testing $at_desc ..." $at_traceon @@ -30961,14 +31426,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_134 -#AT_START_135 -at_fn_group_banner 135 'verify.at:25' \ +#AT_STOP_136 +#AT_START_137 +at_fn_group_banner 137 'verify.at:25' \ "verify" " " 21 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "135. $at_setup_line: testing $at_desc ..." + $as_echo "137. $at_setup_line: testing $at_desc ..." $at_traceon @@ -31172,14 +31637,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_135 -#AT_START_136 -at_fn_group_banner 136 'volume.at:23' \ +#AT_STOP_137 +#AT_START_138 +at_fn_group_banner 138 'volume.at:23' \ "volume" " " 22 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "136. $at_setup_line: testing $at_desc ..." + $as_echo "138. $at_setup_line: testing $at_desc ..." $at_traceon @@ -31335,14 +31800,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_136 -#AT_START_137 -at_fn_group_banner 137 'volsize.at:29' \ +#AT_STOP_138 +#AT_START_139 +at_fn_group_banner 139 'volsize.at:29' \ "volume header size" " " 22 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "137. $at_setup_line: testing $at_desc ..." + $as_echo "139. $at_setup_line: testing $at_desc ..." $at_traceon @@ -31701,14 +32166,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_137 -#AT_START_138 -at_fn_group_banner 138 'comprec.at:21' \ +#AT_STOP_139 +#AT_START_140 +at_fn_group_banner 140 'comprec.at:21' \ "compressed format recognition" " " 23 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "138. $at_setup_line: testing $at_desc ..." + $as_echo "140. $at_setup_line: testing $at_desc ..." $at_traceon @@ -31998,14 +32463,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_138 -#AT_START_139 -at_fn_group_banner 139 'shortfile.at:26' \ +#AT_STOP_140 +#AT_START_141 +at_fn_group_banner 141 'shortfile.at:26' \ "short input files" " " 23 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "139. $at_setup_line: testing $at_desc ..." + $as_echo "141. $at_setup_line: testing $at_desc ..." $at_traceon @@ -32057,14 +32522,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_139 -#AT_START_140 -at_fn_group_banner 140 'shortupd.at:31' \ +#AT_STOP_141 +#AT_START_142 +at_fn_group_banner 142 'shortupd.at:31' \ "updating short archives" " " 23 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "140. $at_setup_line: testing $at_desc ..." + $as_echo "142. $at_setup_line: testing $at_desc ..." $at_traceon @@ -32253,14 +32718,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_140 -#AT_START_141 -at_fn_group_banner 141 'truncate.at:29' \ +#AT_STOP_142 +#AT_START_143 +at_fn_group_banner 143 'truncate.at:29' \ "truncate" " " 23 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "141. $at_setup_line: testing $at_desc ..." + $as_echo "143. $at_setup_line: testing $at_desc ..." $at_traceon @@ -32539,14 +33004,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_141 -#AT_START_142 -at_fn_group_banner 142 'grow.at:24' \ +#AT_STOP_143 +#AT_START_144 +at_fn_group_banner 144 'grow.at:24' \ "grow" " " 23 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "142. $at_setup_line: testing $at_desc ..." + $as_echo "144. $at_setup_line: testing $at_desc ..." $at_traceon @@ -32770,13 +33235,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_142 -#AT_START_143 -at_fn_group_banner 143 'sigpipe.at:21' \ +#AT_STOP_144 +#AT_START_145 +at_fn_group_banner 145 'sigpipe.at:21' \ "sigpipe handling" " " 23 at_xfail=no ( - $as_echo "143. $at_setup_line: testing $at_desc ..." + $as_echo "145. $at_setup_line: testing $at_desc ..." $at_traceon @@ -32835,13 +33300,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_143 -#AT_START_144 -at_fn_group_banner 144 'remfiles01.at:28' \ +#AT_STOP_145 +#AT_START_146 +at_fn_group_banner 146 'remfiles01.at:28' \ "remove-files with compression" " " 24 at_xfail=no ( - $as_echo "144. $at_setup_line: testing $at_desc ..." + $as_echo "146. $at_setup_line: testing $at_desc ..." $at_traceon @@ -32961,13 +33426,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_144 -#AT_START_145 -at_fn_group_banner 145 'remfiles02.at:28' \ +#AT_STOP_146 +#AT_START_147 +at_fn_group_banner 147 'remfiles02.at:28' \ "remove-files with compression: grand-child" " " 24 at_xfail=no ( - $as_echo "145. $at_setup_line: testing $at_desc ..." + $as_echo "147. $at_setup_line: testing $at_desc ..." $at_traceon @@ -33039,13 +33504,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_145 -#AT_START_146 -at_fn_group_banner 146 'remfiles03.at:28' \ +#AT_STOP_147 +#AT_START_148 +at_fn_group_banner 148 'remfiles03.at:28' \ "remove-files with symbolic links" " " 24 at_xfail=no ( - $as_echo "146. $at_setup_line: testing $at_desc ..." + $as_echo "148. $at_setup_line: testing $at_desc ..." $at_traceon @@ -33082,14 +33547,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_146 -#AT_START_147 -at_fn_group_banner 147 'remfiles04a.at:25' \ +#AT_STOP_148 +#AT_START_149 +at_fn_group_banner 149 'remfiles04a.at:25' \ "remove-files with -C:rel in -c/non-incr. mode" " " 24 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "147. $at_setup_line: testing $at_desc ..." + $as_echo "149. $at_setup_line: testing $at_desc ..." $at_traceon @@ -33158,14 +33623,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_147 -#AT_START_148 -at_fn_group_banner 148 'remfiles04b.at:33' \ +#AT_STOP_149 +#AT_START_150 +at_fn_group_banner 150 'remfiles04b.at:33' \ "remove-files with -C:rel in -c/incr. mode" " " 24 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "148. $at_setup_line: testing $at_desc ..." + $as_echo "150. $at_setup_line: testing $at_desc ..." $at_traceon @@ -33234,14 +33699,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_148 -#AT_START_149 -at_fn_group_banner 149 'remfiles04c.at:33' \ +#AT_STOP_150 +#AT_START_151 +at_fn_group_banner 151 'remfiles04c.at:33' \ "remove-files with -C:rel in -r mode" " " 24 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "149. $at_setup_line: testing $at_desc ..." + $as_echo "151. $at_setup_line: testing $at_desc ..." $at_traceon @@ -33322,14 +33787,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_149 -#AT_START_150 -at_fn_group_banner 150 'remfiles05a.at:34' \ +#AT_STOP_151 +#AT_START_152 +at_fn_group_banner 152 'remfiles05a.at:34' \ "remove-files with -C:rel,rel in -c/non-incr. mode" "" 24 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "150. $at_setup_line: testing $at_desc ..." + $as_echo "152. $at_setup_line: testing $at_desc ..." $at_traceon @@ -33411,14 +33876,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_150 -#AT_START_151 -at_fn_group_banner 151 'remfiles05b.at:25' \ +#AT_STOP_152 +#AT_START_153 +at_fn_group_banner 153 'remfiles05b.at:25' \ "remove-files with -C:rel,rel in -c/incr. mode" " " 24 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "151. $at_setup_line: testing $at_desc ..." + $as_echo "153. $at_setup_line: testing $at_desc ..." $at_traceon @@ -33500,14 +33965,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_151 -#AT_START_152 -at_fn_group_banner 152 'remfiles05c.at:25' \ +#AT_STOP_153 +#AT_START_154 +at_fn_group_banner 154 'remfiles05c.at:25' \ "remove-files with -C:rel,rel in -r mode" " " 24 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "152. $at_setup_line: testing $at_desc ..." + $as_echo "154. $at_setup_line: testing $at_desc ..." $at_traceon @@ -33604,14 +34069,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_152 -#AT_START_153 -at_fn_group_banner 153 'remfiles06a.at:25' \ +#AT_STOP_154 +#AT_START_155 +at_fn_group_banner 155 'remfiles06a.at:25' \ "remove-files with -C:rel,abs in -c/non-incr. mode" "" 24 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "153. $at_setup_line: testing $at_desc ..." + $as_echo "155. $at_setup_line: testing $at_desc ..." $at_traceon @@ -33695,14 +34160,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_153 -#AT_START_154 -at_fn_group_banner 154 'remfiles06b.at:25' \ +#AT_STOP_155 +#AT_START_156 +at_fn_group_banner 156 'remfiles06b.at:25' \ "remove-files with -C:rel,abs in -c/incr. mode" " " 24 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "154. $at_setup_line: testing $at_desc ..." + $as_echo "156. $at_setup_line: testing $at_desc ..." $at_traceon @@ -33786,14 +34251,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_154 -#AT_START_155 -at_fn_group_banner 155 'remfiles06c.at:25' \ +#AT_STOP_156 +#AT_START_157 +at_fn_group_banner 157 'remfiles06c.at:25' \ "remove-files with -C:rel,abs in -r mode" " " 24 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "155. $at_setup_line: testing $at_desc ..." + $as_echo "157. $at_setup_line: testing $at_desc ..." $at_traceon @@ -33823,7 +34288,7 @@ tar -cf foo.tar -C foo file -C \$DIR/bar file decho A find . | sort decho B -tar -rvf foo.tar --remove-files -C foo file -C ../bar file +tar -rvf foo.tar --remove-files -C foo file -C \$DIR/bar file decho C find . | sort )" @@ -33850,7 +34315,7 @@ tar -cf foo.tar -C foo file -C $DIR/bar file decho A find . | sort decho B -tar -rvf foo.tar --remove-files -C foo file -C ../bar file +tar -rvf foo.tar --remove-files -C foo file -C $DIR/bar file decho C find . | sort ) @@ -33892,14 +34357,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_155 -#AT_START_156 -at_fn_group_banner 156 'remfiles07a.at:25' \ - "remove-files with -C:rel,abs in -c/non-incr. mode" "" 24 +#AT_STOP_157 +#AT_START_158 +at_fn_group_banner 158 'remfiles07a.at:25' \ + "remove-files with -C:abs,rel in -c/non-incr. mode" "" 24 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "156. $at_setup_line: testing $at_desc ..." + $as_echo "158. $at_setup_line: testing $at_desc ..." $at_traceon @@ -33926,7 +34391,7 @@ echo foo/file > foo/file echo bar/file > bar/file DIR=\`pwd\` decho A -tar -cvf foo.tar --remove-files -C foo file -C \$DIR/bar file +tar -cvf foo.tar --remove-files -C \$DIR/foo file -C ../bar file decho B find . | sort )" @@ -33950,7 +34415,7 @@ echo foo/file > foo/file echo bar/file > bar/file DIR=`pwd` decho A -tar -cvf foo.tar --remove-files -C foo file -C $DIR/bar file +tar -cvf foo.tar --remove-files -C $DIR/foo file -C ../bar file decho B find . | sort ) @@ -33983,14 +34448,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_156 -#AT_START_157 -at_fn_group_banner 157 'remfiles07b.at:25' \ - "remove-files with -C:rel,abs in -c/incr. mode" " " 24 +#AT_STOP_158 +#AT_START_159 +at_fn_group_banner 159 'remfiles07b.at:25' \ + "remove-files with -C:abs,rel in -c/incr. mode" " " 24 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "157. $at_setup_line: testing $at_desc ..." + $as_echo "159. $at_setup_line: testing $at_desc ..." $at_traceon @@ -34017,7 +34482,7 @@ echo foo/file > foo/file echo bar/file > bar/file DIR=\`pwd\` decho A -tar -cvf foo.tar --incremental --remove-files -C foo file -C \$DIR/bar file +tar -cvf foo.tar --incremental --remove-files -C \$DIR/foo file -C ../bar file decho B find . | sort )" @@ -34041,7 +34506,7 @@ echo foo/file > foo/file echo bar/file > bar/file DIR=`pwd` decho A -tar -cvf foo.tar --incremental --remove-files -C foo file -C $DIR/bar file +tar -cvf foo.tar --incremental --remove-files -C $DIR/foo file -C ../bar file decho B find . | sort ) @@ -34074,14 +34539,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_157 -#AT_START_158 -at_fn_group_banner 158 'remfiles07c.at:25' \ - "remove-files with -C:rel,abs in -r mode" " " 24 +#AT_STOP_159 +#AT_START_160 +at_fn_group_banner 160 'remfiles07c.at:25' \ + "remove-files with -C:abs,rel in -r mode" " " 24 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "158. $at_setup_line: testing $at_desc ..." + $as_echo "160. $at_setup_line: testing $at_desc ..." $at_traceon @@ -34107,11 +34572,11 @@ echo file > file echo foo/file > foo/file echo bar/file > bar/file DIR=\`pwd\` -tar -cf foo.tar -C foo file -C \$DIR/bar file +tar -cf foo.tar -C \$DIR/foo file -C ../bar file decho A find . | sort decho B -tar -rvf foo.tar --remove-files -C foo file -C \$DIR/bar file +tar -rvf foo.tar --remove-files -C \$DIR/foo file -C ../bar file decho C find . | sort )" @@ -34134,11 +34599,11 @@ echo file > file echo foo/file > foo/file echo bar/file > bar/file DIR=`pwd` -tar -cf foo.tar -C foo file -C $DIR/bar file +tar -cf foo.tar -C $DIR/foo file -C ../bar file decho A find . | sort decho B -tar -rvf foo.tar --remove-files -C foo file -C $DIR/bar file +tar -rvf foo.tar --remove-files -C $DIR/foo file -C ../bar file decho C find . | sort ) @@ -34180,14 +34645,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_158 -#AT_START_159 -at_fn_group_banner 159 'remfiles08a.at:25' \ - "remove-files with -C:abs,rel in -c/non-incr. mode" "" 24 +#AT_STOP_160 +#AT_START_161 +at_fn_group_banner 161 'remfiles08a.at:28' \ + "remove-files deleting two subdirs in -c/non-incr. mode" "" 24 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "159. $at_setup_line: testing $at_desc ..." + $as_echo "161. $at_setup_line: testing $at_desc ..." $at_traceon @@ -34195,7 +34660,7 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/remfiles08a.at:28: +$as_echo "$at_srcdir/remfiles08a.at:31: mkdir gnu (cd gnu TEST_TAR_FORMAT=gnu @@ -34204,21 +34669,16 @@ TAR_OPTIONS=\"-H gnu\" export TAR_OPTIONS rm -rf * - -test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 - mkdir foo mkdir bar -echo file > file -echo foo/file > foo/file -echo bar/file > bar/file -DIR=\`pwd\` +echo foo/foo_file > foo/foo_file +echo bar/bar_file > bar/bar_file decho A -tar -cvf foo.tar --remove-files -C \$DIR/foo file -C ../bar file +tar -cvf foo.tar --remove-files -C foo . -C ../bar . decho B -find . | sort +find . )" -at_fn_check_prepare_notrace 'a `...` command substitution' "remfiles08a.at:28" +at_fn_check_prepare_notrace 'an embedded newline' "remfiles08a.at:31" ( $at_check_trace; mkdir gnu (cd gnu @@ -34228,19 +34688,14 @@ TAR_OPTIONS="-H gnu" export TAR_OPTIONS rm -rf * - -test -z "`sort < /dev/null 2>&1`" || exit 77 - mkdir foo mkdir bar -echo file > file -echo foo/file > foo/file -echo bar/file > bar/file -DIR=`pwd` +echo foo/foo_file > foo/foo_file +echo bar/bar_file > bar/bar_file decho A -tar -cvf foo.tar --remove-files -C $DIR/foo file -C ../bar file +tar -cvf foo.tar --remove-files -C foo . -C ../bar . decho B -find . | sort +find . ) ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false @@ -34250,17 +34705,16 @@ B " | \ $at_diff - "$at_stderr" || at_failed=: echo >>"$at_stdout"; $as_echo "A -file -file +./ +./foo_file +./ +./bar_file B . -./bar -./file -./foo ./foo.tar " | \ $at_diff - "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/remfiles08a.at:28" +at_fn_check_status 0 $at_status "$at_srcdir/remfiles08a.at:31" $at_failed && at_fn_log_failure $at_traceon; } @@ -34271,22 +34725,24 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_159 -#AT_START_160 -at_fn_group_banner 160 'remfiles08b.at:25' \ - "remove-files with -C:abs,rel in -c/incr. mode" " " 24 -at_xfail=no +#AT_STOP_161 +#AT_START_162 +at_fn_group_banner 162 'remfiles08b.at:31' \ + "remove-files deleting two subdirs in -c/incr. mode" "" 24 +at_xfail=yes test -f $XFAILFILE && at_xfail=yes ( - $as_echo "160. $at_setup_line: testing $at_desc ..." + $as_echo "162. $at_setup_line: testing $at_desc ..." $at_traceon + # we expect to fail in tar 1.27 + { set +x -$as_echo "$at_srcdir/remfiles08b.at:28: +$as_echo "$at_srcdir/remfiles08b.at:36: mkdir gnu (cd gnu TEST_TAR_FORMAT=gnu @@ -34295,21 +34751,16 @@ TAR_OPTIONS=\"-H gnu\" export TAR_OPTIONS rm -rf * - -test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 - mkdir foo mkdir bar -echo file > file -echo foo/file > foo/file -echo bar/file > bar/file -DIR=\`pwd\` +echo foo/foo_file > foo/foo_file +echo bar/bar_file > bar/bar_file decho A -tar -cvf foo.tar --incremental --remove-files -C \$DIR/foo file -C ../bar file +tar -cvf foo.tar --incremental --remove-files -C foo . -C ../bar . decho B -find . | sort +find . )" -at_fn_check_prepare_notrace 'a `...` command substitution' "remfiles08b.at:28" +at_fn_check_prepare_notrace 'an embedded newline' "remfiles08b.at:36" ( $at_check_trace; mkdir gnu (cd gnu @@ -34319,39 +34770,35 @@ TAR_OPTIONS="-H gnu" export TAR_OPTIONS rm -rf * - -test -z "`sort < /dev/null 2>&1`" || exit 77 - mkdir foo mkdir bar -echo file > file -echo foo/file > foo/file -echo bar/file > bar/file -DIR=`pwd` +echo foo/foo_file > foo/foo_file +echo bar/bar_file > bar/bar_file decho A -tar -cvf foo.tar --incremental --remove-files -C $DIR/foo file -C ../bar file +tar -cvf foo.tar --incremental --remove-files -C foo . -C ../bar . decho B -find . | sort +find . ) ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter echo >>"$at_stderr"; $as_echo "A +tar: .: Directory is new +tar: .: Directory is new B " | \ $at_diff - "$at_stderr" || at_failed=: echo >>"$at_stdout"; $as_echo "A -file -file +./ +./ +./foo_file +./bar_file B . -./bar -./file -./foo ./foo.tar " | \ $at_diff - "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/remfiles08b.at:28" +at_fn_check_status 0 $at_status "$at_srcdir/remfiles08b.at:36" $at_failed && at_fn_log_failure $at_traceon; } @@ -34362,14 +34809,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_160 -#AT_START_161 -at_fn_group_banner 161 'remfiles08c.at:25' \ - "remove-files with -C:abs,rel in -r mode" " " 24 +#AT_STOP_162 +#AT_START_163 +at_fn_group_banner 163 'remfiles08c.at:28' \ + "remove-files deleting two subdirs in -r mode" " " 24 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "161. $at_setup_line: testing $at_desc ..." + $as_echo "163. $at_setup_line: testing $at_desc ..." $at_traceon @@ -34377,7 +34824,7 @@ at_xfail=no { set +x -$as_echo "$at_srcdir/remfiles08c.at:28: +$as_echo "$at_srcdir/remfiles08c.at:31: mkdir gnu (cd gnu TEST_TAR_FORMAT=gnu @@ -34391,19 +34838,17 @@ test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 mkdir foo mkdir bar -echo file > file -echo foo/file > foo/file -echo bar/file > bar/file -DIR=\`pwd\` -tar -cf foo.tar -C \$DIR/foo file -C ../bar file +echo foo/foo_file > foo/foo_file +echo bar/bar_file > bar/bar_file +tar -cf foo.tar -C foo . -C ../bar . decho A find . | sort decho B -tar -rvf foo.tar --remove-files -C \$DIR/foo file -C ../bar file +tar -rvf foo.tar --remove-files -C foo . -C ../bar . decho C -find . | sort +find . )" -at_fn_check_prepare_notrace 'a `...` command substitution' "remfiles08c.at:28" +at_fn_check_prepare_notrace 'a `...` command substitution' "remfiles08c.at:31" ( $at_check_trace; mkdir gnu (cd gnu @@ -34418,17 +34863,15 @@ test -z "`sort < /dev/null 2>&1`" || exit 77 mkdir foo mkdir bar -echo file > file -echo foo/file > foo/file -echo bar/file > bar/file -DIR=`pwd` -tar -cf foo.tar -C $DIR/foo file -C ../bar file +echo foo/foo_file > foo/foo_file +echo bar/bar_file > bar/bar_file +tar -cf foo.tar -C foo . -C ../bar . decho A find . | sort decho B -tar -rvf foo.tar --remove-files -C $DIR/foo file -C ../bar file +tar -rvf foo.tar --remove-files -C foo . -C ../bar . decho C -find . | sort +find . ) ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false @@ -34441,23 +34884,21 @@ C echo >>"$at_stdout"; $as_echo "A . ./bar -./bar/file -./file +./bar/bar_file ./foo ./foo.tar -./foo/file +./foo/foo_file B -file -file +./ +./foo_file +./ +./bar_file C . -./bar -./file -./foo ./foo.tar " | \ $at_diff - "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/remfiles08c.at:28" +at_fn_check_status 0 $at_status "$at_srcdir/remfiles08c.at:31" $at_failed && at_fn_log_failure $at_traceon; } @@ -34468,14 +34909,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_161 -#AT_START_162 -at_fn_group_banner 162 'remfiles09a.at:25' \ +#AT_STOP_163 +#AT_START_164 +at_fn_group_banner 164 'remfiles09a.at:25' \ "remove-files on full directory in -c/non-incr. mode" "" 24 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "162. $at_setup_line: testing $at_desc ..." + $as_echo "164. $at_setup_line: testing $at_desc ..." $at_traceon @@ -34542,14 +34983,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_162 -#AT_START_163 -at_fn_group_banner 163 'remfiles09b.at:29' \ +#AT_STOP_164 +#AT_START_165 +at_fn_group_banner 165 'remfiles09b.at:29' \ "remove-files on full directory in -c/incr. mode" "" 24 at_xfail=yes test -f $XFAILFILE && at_xfail=yes ( - $as_echo "163. $at_setup_line: testing $at_desc ..." + $as_echo "165. $at_setup_line: testing $at_desc ..." $at_traceon @@ -34568,18 +35009,14 @@ TAR_OPTIONS=\"-H gnu\" export TAR_OPTIONS rm -rf * - -test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 - mkdir foo echo foo/file > foo/file decho A tar -cvf foo.tar --incremental --remove-files foo -TARSTAT=\$? decho B find . )" -at_fn_check_prepare_notrace 'a `...` command substitution' "remfiles09b.at:34" +at_fn_check_prepare_notrace 'an embedded newline' "remfiles09b.at:34" ( $at_check_trace; mkdir gnu (cd gnu @@ -34589,14 +35026,10 @@ TAR_OPTIONS="-H gnu" export TAR_OPTIONS rm -rf * - -test -z "`sort < /dev/null 2>&1`" || exit 77 - mkdir foo echo foo/file > foo/file decho A tar -cvf foo.tar --incremental --remove-files foo -TARSTAT=$? decho B find . ) @@ -34613,7 +35046,6 @@ foo/ foo/file B . -./foo ./foo.tar " | \ $at_diff - "$at_stdout" || at_failed=: @@ -34628,14 +35060,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_163 -#AT_START_164 -at_fn_group_banner 164 'remfiles09c.at:25' \ +#AT_STOP_165 +#AT_START_166 +at_fn_group_banner 166 'remfiles09c.at:25' \ "remove-files on full directory in -r mode" " " 24 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "164. $at_setup_line: testing $at_desc ..." + $as_echo "166. $at_setup_line: testing $at_desc ..." $at_traceon @@ -34720,14 +35152,93 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_164 -#AT_START_165 -at_fn_group_banner 165 'xattr01.at:25' \ +#AT_STOP_166 +#AT_START_167 +at_fn_group_banner 167 'remfiles10.at:20' \ + "remove-files" " " 24 +at_xfail=no + test -f $XFAILFILE && at_xfail=yes +( + $as_echo "167. $at_setup_line: testing $at_desc ..." + $at_traceon + + + + + + { set +x +$as_echo "$at_srcdir/remfiles10.at:23: +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H gnu\" +export TAR_OPTIONS +rm -rf * + +mkdir foo +echo foo/file > foo/file +decho A +(cd foo && tar -cvf ../foo.tar --remove-files .) +tar_status=\$? +decho B +find foo +exit \$tar_status +)" +at_fn_check_prepare_notrace 'an embedded newline' "remfiles10.at:23" +( $at_check_trace; +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS="-H gnu" +export TAR_OPTIONS +rm -rf * + +mkdir foo +echo foo/file > foo/file +decho A +(cd foo && tar -cvf ../foo.tar --remove-files .) +tar_status=$? +decho B +find foo +exit $tar_status +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +echo >>"$at_stderr"; $as_echo "A +tar: .: Cannot rmdir: Invalid argument +tar: Exiting with failure status due to previous errors +B +" | \ + $at_diff - "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "A +./ +./file +B +foo +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 2 $at_status "$at_srcdir/remfiles10.at:23" +$at_failed && at_fn_log_failure +$at_traceon; } + + + + + set +x + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 7>&- | eval $at_tee_pipe +read at_status <"$at_status_file" +#AT_STOP_167 +#AT_START_168 +at_fn_group_banner 168 'xattr01.at:25' \ "xattrs: basic functionality" " " 25 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "165. $at_setup_line: testing $at_desc ..." + $as_echo "168. $at_setup_line: testing $at_desc ..." $at_traceon @@ -35281,14 +35792,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_165 -#AT_START_166 -at_fn_group_banner 166 'xattr02.at:25' \ +#AT_STOP_168 +#AT_START_169 +at_fn_group_banner 169 'xattr02.at:25' \ "xattrs: change directory with -C option" " " 25 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "166. $at_setup_line: testing $at_desc ..." + $as_echo "169. $at_setup_line: testing $at_desc ..." $at_traceon @@ -35917,14 +36428,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_166 -#AT_START_167 -at_fn_group_banner 167 'xattr03.at:25' \ +#AT_STOP_169 +#AT_START_170 +at_fn_group_banner 170 'xattr03.at:25' \ "xattrs: trusted.* attributes" " " 25 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "167. $at_setup_line: testing $at_desc ..." + $as_echo "170. $at_setup_line: testing $at_desc ..." $at_traceon @@ -36633,14 +37144,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_167 -#AT_START_168 -at_fn_group_banner 168 'xattr04.at:26' \ +#AT_STOP_170 +#AT_START_171 +at_fn_group_banner 171 'xattr04.at:26' \ "xattrs: s/open/openat/ regression" " " 25 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "168. $at_setup_line: testing $at_desc ..." + $as_echo "171. $at_setup_line: testing $at_desc ..." $at_traceon @@ -37199,14 +37710,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_168 -#AT_START_169 -at_fn_group_banner 169 'xattr05.at:28' \ +#AT_STOP_171 +#AT_START_172 +at_fn_group_banner 172 'xattr05.at:28' \ "xattrs: keywords with '=' and '%'" " " 25 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "169. $at_setup_line: testing $at_desc ..." + $as_echo "172. $at_setup_line: testing $at_desc ..." $at_traceon @@ -37755,14 +38266,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_169 -#AT_START_170 -at_fn_group_banner 170 'acls01.at:25' \ +#AT_STOP_172 +#AT_START_173 +at_fn_group_banner 173 'acls01.at:25' \ "acls: basic functionality" " " 25 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "170. $at_setup_line: testing $at_desc ..." + $as_echo "173. $at_setup_line: testing $at_desc ..." $at_traceon @@ -38521,14 +39032,14 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_170 -#AT_START_171 -at_fn_group_banner 171 'acls02.at:25' \ +#AT_STOP_173 +#AT_START_174 +at_fn_group_banner 174 'acls02.at:25' \ "acls: work with -C" " " 25 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "171. $at_setup_line: testing $at_desc ..." + $as_echo "174. $at_setup_line: testing $at_desc ..." $at_traceon @@ -39347,22 +39858,26 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_171 -#AT_START_172 -at_fn_group_banner 172 'selnx01.at:25' \ - "selinux: basic store/restore" " " 25 +#AT_STOP_174 +#AT_START_175 +at_fn_group_banner 175 'acls03.at:30' \ + "acls: default ACLs" " " 25 at_xfail=no test -f $XFAILFILE && at_xfail=yes ( - $as_echo "172. $at_setup_line: testing $at_desc ..." + $as_echo "175. $at_setup_line: testing $at_desc ..." $at_traceon + + + + { set +x -$as_echo "$at_srcdir/selnx01.at:28: +$as_echo "$at_srcdir/acls03.at:47: mkdir v7 (cd v7 TEST_TAR_FORMAT=v7 @@ -39390,13 +39905,13 @@ rm -rf * file=\$(TMPDIR=. mktemp fiXXXXXX) - restorecon \$file &> /dev/null + setfacl -m u:\$UID:rwx \$file &> /dev/null if test \"\$?\" != 0; then exit 77 fi - chcon -h --user=unconfined_u \$file &> /dev/null + getfacl \$file &> /dev/null if test \"\$?\" != 0; then exit 77 fi @@ -39404,310 +39919,188 @@ rm -rf * rm -rf \$file file=\$(TMPDIR=. mktemp fiXXXXXX) - err=\$( tar --selinux -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) + setfacl -m u:\$UID:rwx \$file + err=\$( tar --acls -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) if test \"\$err\" != \"0\"; then exit 77 fi -mkdir dir -genfile --file dir/file -ln -s file dir/link - -getfattr -h -d -msecurity.selinux dir dir/file dir/link > start - -restorecon -R dir -chcon -h --user=system_u dir -chcon -h --user=unconfined_u dir/file -chcon -h --user=system_u dir/link - -# archive whole directory including selinux contexts -tar --selinux -cf archive.tar dir - -# clear the directory -rm -rf dir - -# ================================================ -# check if selinux contexts are correctly restored - -tar --selinux -xf archive.tar - -# archive for later debugging -cp archive.tar archive_origin.tar - -# check if selinux contexts were restored -getfattr -h -d dir dir/file dir/link -msecurity.selinux | \\ - grep -v -e '^#' -e ^\$ | cut -d: -f1 - -# =========================================================================== -# check if selinux contexts are not restored when --selinux option is missing - -getfattr -h -d -msecurity.selinux dir dir/file dir/link > with_selinux -rm -rf dir -tar -xf archive.tar -getfattr -h -d -msecurity.selinux dir dir/file dir/link > without_selinux - -diff with_selinux without_selinux > diff_with_without -if test \"\$?\" -eq \"0\"; then - echo \"selinux contexts probably restored while --selinux is off\" -fi - -# ================================================================= -# check if selinux is not archived when --selinux option is missing - -tar -cf archive.tar dir - -# clear the directory -rm -rf dir - -# restore (with --selinux) -tar --selinux -xf archive.tar dir - -getfattr -h -d -msecurity.selinux dir dir/file dir/link > final -diff start final > final_diff -if test \"\$?\" -ne \"0\"; then - echo \"bad result\" -fi - -)" -at_fn_check_prepare_notrace 'a $(...) command substitution' "selnx01.at:28" -( $at_check_trace; -mkdir v7 -(cd v7 -TEST_TAR_FORMAT=v7 -export TEST_TAR_FORMAT -TAR_OPTIONS="-H v7" -export TAR_OPTIONS -rm -rf * - - - file=$(TMPDIR=. mktemp fiXXXXXX) - - setfattr -n user.test -v test $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi - - - getfattr $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi - - - - - file=$(TMPDIR=. mktemp fiXXXXXX) - - restorecon $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi - - - chcon -h --user=unconfined_u $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi - - rm -rf $file - - file=$(TMPDIR=. mktemp fiXXXXXX) - err=$( tar --selinux -cf /dev/null $file 2>&1 >/dev/null | wc -l ) - if test "$err" != "0"; then - exit 77 - fi +test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 -mkdir dir -genfile --file dir/file -ln -s file dir/link +MYNAME=\$( id -un ) +MYGROUP=\$( id -gn ) -getfattr -h -d -msecurity.selinux dir dir/file dir/link > start +# Prepare directory structure with default ACLs +mkdir -p pure/d1/d2 +genfile --file pure/d1/f2a +genfile --file pure/d1/f2b +genfile --file pure/d1/d2/f3a +genfile --file pure/d1/d2/f3b +setfacl -m g:\$MYGROUP:r-x pure/d1 +setfacl -d -m g:\$MYGROUP:rwx pure/d1 +setfacl -d -m u:\$MYNAME:rwx pure/d1 +# \"*a\" files have \"some\" additional ACLs +setfacl -m u:\$MYNAME:--- pure/d1/d2/f3a +setfacl -m u:\$MYNAME:--- pure/d1/f2a -restorecon -R dir -chcon -h --user=system_u dir -chcon -h --user=unconfined_u dir/file -chcon -h --user=system_u dir/link +# use default format (no acls stored) +tar -cf noacl.tar -C pure d1 -# archive whole directory including selinux contexts -tar --selinux -cf archive.tar dir +# use posix format, acls stored +tar --acls -cf acl.tar -C pure d1 -# clear the directory -rm -rf dir +# Directory names are chosen based on \"how the files were extracted from +# archive\". Equivalent no* tags are used also: +# ^sacl_ — extracted archive has stored ACLs +# _def_ — target directory (-C) has default ACLs +# _optacl\$ — extraction was done with --acls option -# ================================================ -# check if selinux contexts are correctly restored +mkdir sacl_def_optacl +mkdir sacl_def_optnoacl +mkdir sacl_nodef_optacl +mkdir sacl_nodef_optnoacl +mkdir nosacl_def_optacl +mkdir nosacl_def_optnoacl +mkdir nosacl_nodef_optacl +mkdir nosacl_nodef_optnoacl -tar --selinux -xf archive.tar +setfacl -d -m u:\$MYNAME:--- nosacl_def_optnoacl sacl_def_optnoacl sacl_def_optacl nosacl_def_optacl +setfacl -d -m g:\$MYGROUP:--- nosacl_def_optnoacl sacl_def_optnoacl sacl_def_optacl nosacl_def_optacl -# archive for later debugging -cp archive.tar archive_origin.tar +tar -xf acl.tar -C sacl_nodef_optnoacl +tar --acls -xf acl.tar -C sacl_nodef_optacl +tar -xf acl.tar -C sacl_def_optnoacl +tar --acls -xf acl.tar -C sacl_def_optacl +tar -xf noacl.tar -C nosacl_def_optnoacl +# _NO_ ACLs in output +tar -xf noacl.tar -C nosacl_nodef_optnoacl +tar -xf noacl.tar -C nosacl_nodef_optacl +tar -cf noacl_repackaged.tar -C nosacl_nodef_optnoacl d1 +# _NO_ ACLs in output (even when default ACLs exist) +tar --acls -xf noacl_repackaged.tar -C nosacl_def_optacl -# check if selinux contexts were restored -getfattr -h -d dir dir/file dir/link -msecurity.selinux | \ - grep -v -e '^#' -e ^$ | cut -d: -f1 -# =========================================================================== -# check if selinux contexts are not restored when --selinux option is missing + cd pure + pure=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. -getfattr -h -d -msecurity.selinux dir dir/file dir/link > with_selinux -rm -rf dir -tar -xf archive.tar -getfattr -h -d -msecurity.selinux dir dir/file dir/link > without_selinux -diff with_selinux without_selinux > diff_with_without -if test "$?" -eq "0"; then - echo "selinux contexts probably restored while --selinux is off" -fi -# ================================================================= -# check if selinux is not archived when --selinux option is missing + cd sacl_def_optacl + sacl_def_optacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. -tar -cf archive.tar dir -# clear the directory -rm -rf dir + cd sacl_def_optnoacl + sacl_def_optnoacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. -# restore (with --selinux) -tar --selinux -xf archive.tar dir -getfattr -h -d -msecurity.selinux dir dir/file dir/link > final -diff start final > final_diff -if test "$?" -ne "0"; then - echo "bad result" -fi + cd sacl_nodef_optacl + sacl_nodef_optacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. -) -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo >>"$at_stdout"; $as_echo "security.selinux=\"system_u -security.selinux=\"unconfined_u -security.selinux=\"system_u -" | \ - $at_diff - "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/selnx01.at:28" -$at_failed && at_fn_log_failure -$at_traceon; } - { set +x -$as_echo "$at_srcdir/selnx01.at:28: -mkdir oldgnu -(cd oldgnu -TEST_TAR_FORMAT=oldgnu -export TEST_TAR_FORMAT -TAR_OPTIONS=\"-H oldgnu\" -export TAR_OPTIONS -rm -rf * + cd sacl_nodef_optnoacl + sacl_nodef_optnoacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. - file=\$(TMPDIR=. mktemp fiXXXXXX) + cd nosacl_def_optacl + nosacl_def_optacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. - setfattr -n user.test -v test \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi + cd nosacl_def_optnoacl + nosacl_def_optnoacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. - getfattr \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi + cd nosacl_nodef_optacl + nosacl_nodef_optacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. - - file=\$(TMPDIR=. mktemp fiXXXXXX) - - restorecon \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi + cd nosacl_nodef_optnoacl + nosacl_nodef_optnoacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. - chcon -h --user=unconfined_u \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi - rm -rf \$file + echo \"\$pure\" > pure.log + echo \"\$sacl_def_optacl\" > sacl_def_optacl.log + if test ! \"\$pure\" \"=\" \"\$sacl_def_optacl\"; then + echo \"bad 'pure' against 'sacl_def_optacl' output\" + fi - file=\$(TMPDIR=. mktemp fiXXXXXX) - err=\$( tar --selinux -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) - if test \"\$err\" != \"0\"; then - exit 77 - fi -mkdir dir -genfile --file dir/file -ln -s file dir/link - -getfattr -h -d -msecurity.selinux dir dir/file dir/link > start + echo \"\$sacl_def_optacl\" > sacl_def_optacl.log + echo \"\$sacl_nodef_optacl\" > sacl_nodef_optacl.log + if test ! \"\$sacl_def_optacl\" \"=\" \"\$sacl_nodef_optacl\"; then + echo \"bad 'sacl_def_optacl' against 'sacl_nodef_optacl' output\" + fi -restorecon -R dir -chcon -h --user=system_u dir -chcon -h --user=unconfined_u dir/file -chcon -h --user=system_u dir/link -# archive whole directory including selinux contexts -tar --selinux -cf archive.tar dir + echo \"\$sacl_def_optnoacl\" > sacl_def_optnoacl.log + echo \"\$nosacl_def_optnoacl\" > nosacl_def_optnoacl.log + if test ! \"\$sacl_def_optnoacl\" \"=\" \"\$nosacl_def_optnoacl\"; then + echo \"bad 'sacl_def_optnoacl' against 'nosacl_def_optnoacl' output\" + fi -# clear the directory -rm -rf dir -# ================================================ -# check if selinux contexts are correctly restored + echo \"\$sacl_nodef_optnoacl\" > sacl_nodef_optnoacl.log + echo \"\$nosacl_nodef_optnoacl\" > nosacl_nodef_optnoacl.log + if test ! \"\$sacl_nodef_optnoacl\" \"=\" \"\$nosacl_nodef_optnoacl\"; then + echo \"bad 'sacl_nodef_optnoacl' against 'nosacl_nodef_optnoacl' output\" + fi -tar --selinux -xf archive.tar -# archive for later debugging -cp archive.tar archive_origin.tar + echo \"\$nosacl_def_optacl\" > nosacl_def_optacl.log + echo \"\$nosacl_nodef_optacl\" > nosacl_nodef_optacl.log + if test ! \"\$nosacl_def_optacl\" \"=\" \"\$nosacl_nodef_optacl\"; then + echo \"bad 'nosacl_def_optacl' against 'nosacl_nodef_optacl' output\" + fi -# check if selinux contexts were restored -getfattr -h -d dir dir/file dir/link -msecurity.selinux | \\ - grep -v -e '^#' -e ^\$ | cut -d: -f1 -# =========================================================================== -# check if selinux contexts are not restored when --selinux option is missing + echo \"\$nosacl_def_optacl\" > nosacl_def_optacl.log + echo \"\$nosacl_nodef_optnoacl\" > nosacl_nodef_optnoacl.log + if test ! \"\$nosacl_def_optacl\" \"=\" \"\$nosacl_nodef_optnoacl\"; then + echo \"bad 'nosacl_def_optacl' against 'nosacl_nodef_optnoacl' output\" + fi -getfattr -h -d -msecurity.selinux dir dir/file dir/link > with_selinux -rm -rf dir -tar -xf archive.tar -getfattr -h -d -msecurity.selinux dir dir/file dir/link > without_selinux -diff with_selinux without_selinux > diff_with_without -if test \"\$?\" -eq \"0\"; then - echo \"selinux contexts probably restored while --selinux is off\" -fi -# ================================================================= -# check if selinux is not archived when --selinux option is missing + echo \"\$sacl_def_optacl\" > sacl_def_optacl.log + echo \"\$sacl_def_optnoacl\" > sacl_def_optnoacl.log + if test ! \"\$sacl_def_optacl\" \"!=\" \"\$sacl_def_optnoacl\"; then + echo \"bad 'sacl_def_optacl' against 'sacl_def_optnoacl' output\" + fi -tar -cf archive.tar dir -# clear the directory -rm -rf dir + echo \"\$sacl_def_optacl\" > sacl_def_optacl.log + echo \"\$nosacl_def_optnoacl\" > nosacl_def_optnoacl.log + if test ! \"\$sacl_def_optacl\" \"!=\" \"\$nosacl_def_optnoacl\"; then + echo \"bad 'sacl_def_optacl' against 'nosacl_def_optnoacl' output\" + fi -# restore (with --selinux) -tar --selinux -xf archive.tar dir -getfattr -h -d -msecurity.selinux dir dir/file dir/link > final -diff start final > final_diff -if test \"\$?\" -ne \"0\"; then - echo \"bad result\" -fi + echo \"\$nosacl_def_optnoacl\" > nosacl_def_optnoacl.log + echo \"\$nosacl_nodef_optnoacl\" > nosacl_nodef_optnoacl.log + if test ! \"\$nosacl_def_optnoacl\" \"!=\" \"\$nosacl_nodef_optnoacl\"; then + echo \"bad 'nosacl_def_optnoacl' against 'nosacl_nodef_optnoacl' output\" + fi )" -at_fn_check_prepare_notrace 'a $(...) command substitution' "selnx01.at:28" +at_fn_check_prepare_notrace 'a `...` command substitution' "acls03.at:47" ( $at_check_trace; -mkdir oldgnu -(cd oldgnu -TEST_TAR_FORMAT=oldgnu +mkdir v7 +(cd v7 +TEST_TAR_FORMAT=v7 export TEST_TAR_FORMAT -TAR_OPTIONS="-H oldgnu" +TAR_OPTIONS="-H v7" export TAR_OPTIONS rm -rf * @@ -39730,13 +40123,13 @@ rm -rf * file=$(TMPDIR=. mktemp fiXXXXXX) - restorecon $file &> /dev/null + setfacl -m u:$UID:rwx $file &> /dev/null if test "$?" != 0; then exit 77 fi - chcon -h --user=unconfined_u $file &> /dev/null + getfacl $file &> /dev/null if test "$?" != 0; then exit 77 fi @@ -39744,92 +40137,197 @@ rm -rf * rm -rf $file file=$(TMPDIR=. mktemp fiXXXXXX) - err=$( tar --selinux -cf /dev/null $file 2>&1 >/dev/null | wc -l ) + setfacl -m u:$UID:rwx $file + err=$( tar --acls -cf /dev/null $file 2>&1 >/dev/null | wc -l ) if test "$err" != "0"; then exit 77 fi -mkdir dir -genfile --file dir/file -ln -s file dir/link +test -z "`sort < /dev/null 2>&1`" || exit 77 -getfattr -h -d -msecurity.selinux dir dir/file dir/link > start -restorecon -R dir -chcon -h --user=system_u dir -chcon -h --user=unconfined_u dir/file -chcon -h --user=system_u dir/link +MYNAME=$( id -un ) +MYGROUP=$( id -gn ) -# archive whole directory including selinux contexts -tar --selinux -cf archive.tar dir +# Prepare directory structure with default ACLs +mkdir -p pure/d1/d2 +genfile --file pure/d1/f2a +genfile --file pure/d1/f2b +genfile --file pure/d1/d2/f3a +genfile --file pure/d1/d2/f3b +setfacl -m g:$MYGROUP:r-x pure/d1 +setfacl -d -m g:$MYGROUP:rwx pure/d1 +setfacl -d -m u:$MYNAME:rwx pure/d1 +# "*a" files have "some" additional ACLs +setfacl -m u:$MYNAME:--- pure/d1/d2/f3a +setfacl -m u:$MYNAME:--- pure/d1/f2a -# clear the directory -rm -rf dir +# use default format (no acls stored) +tar -cf noacl.tar -C pure d1 -# ================================================ -# check if selinux contexts are correctly restored +# use posix format, acls stored +tar --acls -cf acl.tar -C pure d1 -tar --selinux -xf archive.tar +# Directory names are chosen based on "how the files were extracted from +# archive". Equivalent no* tags are used also: +# ^sacl_ — extracted archive has stored ACLs +# _def_ — target directory (-C) has default ACLs +# _optacl$ — extraction was done with --acls option -# archive for later debugging -cp archive.tar archive_origin.tar +mkdir sacl_def_optacl +mkdir sacl_def_optnoacl +mkdir sacl_nodef_optacl +mkdir sacl_nodef_optnoacl +mkdir nosacl_def_optacl +mkdir nosacl_def_optnoacl +mkdir nosacl_nodef_optacl +mkdir nosacl_nodef_optnoacl -# check if selinux contexts were restored -getfattr -h -d dir dir/file dir/link -msecurity.selinux | \ - grep -v -e '^#' -e ^$ | cut -d: -f1 +setfacl -d -m u:$MYNAME:--- nosacl_def_optnoacl sacl_def_optnoacl sacl_def_optacl nosacl_def_optacl +setfacl -d -m g:$MYGROUP:--- nosacl_def_optnoacl sacl_def_optnoacl sacl_def_optacl nosacl_def_optacl -# =========================================================================== -# check if selinux contexts are not restored when --selinux option is missing +tar -xf acl.tar -C sacl_nodef_optnoacl +tar --acls -xf acl.tar -C sacl_nodef_optacl +tar -xf acl.tar -C sacl_def_optnoacl +tar --acls -xf acl.tar -C sacl_def_optacl +tar -xf noacl.tar -C nosacl_def_optnoacl +# _NO_ ACLs in output +tar -xf noacl.tar -C nosacl_nodef_optnoacl +tar -xf noacl.tar -C nosacl_nodef_optacl +tar -cf noacl_repackaged.tar -C nosacl_nodef_optnoacl d1 +# _NO_ ACLs in output (even when default ACLs exist) +tar --acls -xf noacl_repackaged.tar -C nosacl_def_optacl -getfattr -h -d -msecurity.selinux dir dir/file dir/link > with_selinux -rm -rf dir -tar -xf archive.tar -getfattr -h -d -msecurity.selinux dir dir/file dir/link > without_selinux -diff with_selinux without_selinux > diff_with_without -if test "$?" -eq "0"; then - echo "selinux contexts probably restored while --selinux is off" -fi + cd pure + pure="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. -# ================================================================= -# check if selinux is not archived when --selinux option is missing -tar -cf archive.tar dir -# clear the directory -rm -rf dir + cd sacl_def_optacl + sacl_def_optacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. -# restore (with --selinux) -tar --selinux -xf archive.tar dir -getfattr -h -d -msecurity.selinux dir dir/file dir/link > final -diff start final > final_diff -if test "$?" -ne "0"; then - echo "bad result" -fi + cd sacl_def_optnoacl + sacl_def_optnoacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd sacl_nodef_optacl + sacl_nodef_optacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd sacl_nodef_optnoacl + sacl_nodef_optnoacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd nosacl_def_optacl + nosacl_def_optacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd nosacl_def_optnoacl + nosacl_def_optnoacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd nosacl_nodef_optacl + nosacl_nodef_optacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd nosacl_nodef_optnoacl + nosacl_nodef_optnoacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + + echo "$pure" > pure.log + echo "$sacl_def_optacl" > sacl_def_optacl.log + if test ! "$pure" "=" "$sacl_def_optacl"; then + echo "bad 'pure' against 'sacl_def_optacl' output" + fi + + + + echo "$sacl_def_optacl" > sacl_def_optacl.log + echo "$sacl_nodef_optacl" > sacl_nodef_optacl.log + if test ! "$sacl_def_optacl" "=" "$sacl_nodef_optacl"; then + echo "bad 'sacl_def_optacl' against 'sacl_nodef_optacl' output" + fi + + + echo "$sacl_def_optnoacl" > sacl_def_optnoacl.log + echo "$nosacl_def_optnoacl" > nosacl_def_optnoacl.log + if test ! "$sacl_def_optnoacl" "=" "$nosacl_def_optnoacl"; then + echo "bad 'sacl_def_optnoacl' against 'nosacl_def_optnoacl' output" + fi + + + echo "$sacl_nodef_optnoacl" > sacl_nodef_optnoacl.log + echo "$nosacl_nodef_optnoacl" > nosacl_nodef_optnoacl.log + if test ! "$sacl_nodef_optnoacl" "=" "$nosacl_nodef_optnoacl"; then + echo "bad 'sacl_nodef_optnoacl' against 'nosacl_nodef_optnoacl' output" + fi + + + echo "$nosacl_def_optacl" > nosacl_def_optacl.log + echo "$nosacl_nodef_optacl" > nosacl_nodef_optacl.log + if test ! "$nosacl_def_optacl" "=" "$nosacl_nodef_optacl"; then + echo "bad 'nosacl_def_optacl' against 'nosacl_nodef_optacl' output" + fi + + + echo "$nosacl_def_optacl" > nosacl_def_optacl.log + echo "$nosacl_nodef_optnoacl" > nosacl_nodef_optnoacl.log + if test ! "$nosacl_def_optacl" "=" "$nosacl_nodef_optnoacl"; then + echo "bad 'nosacl_def_optacl' against 'nosacl_nodef_optnoacl' output" + fi + + + + echo "$sacl_def_optacl" > sacl_def_optacl.log + echo "$sacl_def_optnoacl" > sacl_def_optnoacl.log + if test ! "$sacl_def_optacl" "!=" "$sacl_def_optnoacl"; then + echo "bad 'sacl_def_optacl' against 'sacl_def_optnoacl' output" + fi + + + echo "$sacl_def_optacl" > sacl_def_optacl.log + echo "$nosacl_def_optnoacl" > nosacl_def_optnoacl.log + if test ! "$sacl_def_optacl" "!=" "$nosacl_def_optnoacl"; then + echo "bad 'sacl_def_optacl' against 'nosacl_def_optnoacl' output" + fi + + + echo "$nosacl_def_optnoacl" > nosacl_def_optnoacl.log + echo "$nosacl_nodef_optnoacl" > nosacl_nodef_optnoacl.log + if test ! "$nosacl_def_optnoacl" "!=" "$nosacl_nodef_optnoacl"; then + echo "bad 'nosacl_def_optnoacl' against 'nosacl_nodef_optnoacl' output" + fi ) ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: -echo >>"$at_stdout"; $as_echo "security.selinux=\"system_u -security.selinux=\"unconfined_u -security.selinux=\"system_u -" | \ - $at_diff - "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/selnx01.at:28" +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/acls03.at:47" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/selnx01.at:28: -mkdir ustar -(cd ustar -TEST_TAR_FORMAT=ustar +$as_echo "$at_srcdir/acls03.at:47: +mkdir oldgnu +(cd oldgnu +TEST_TAR_FORMAT=oldgnu export TEST_TAR_FORMAT -TAR_OPTIONS=\"-H ustar\" +TAR_OPTIONS=\"-H oldgnu\" export TAR_OPTIONS rm -rf * @@ -39852,13 +40350,13 @@ rm -rf * file=\$(TMPDIR=. mktemp fiXXXXXX) - restorecon \$file &> /dev/null + setfacl -m u:\$UID:rwx \$file &> /dev/null if test \"\$?\" != 0; then exit 77 fi - chcon -h --user=unconfined_u \$file &> /dev/null + getfacl \$file &> /dev/null if test \"\$?\" != 0; then exit 77 fi @@ -39866,79 +40364,188 @@ rm -rf * rm -rf \$file file=\$(TMPDIR=. mktemp fiXXXXXX) - err=\$( tar --selinux -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) + setfacl -m u:\$UID:rwx \$file + err=\$( tar --acls -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) if test \"\$err\" != \"0\"; then exit 77 fi -mkdir dir -genfile --file dir/file -ln -s file dir/link +test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 -getfattr -h -d -msecurity.selinux dir dir/file dir/link > start -restorecon -R dir -chcon -h --user=system_u dir -chcon -h --user=unconfined_u dir/file -chcon -h --user=system_u dir/link +MYNAME=\$( id -un ) +MYGROUP=\$( id -gn ) -# archive whole directory including selinux contexts -tar --selinux -cf archive.tar dir +# Prepare directory structure with default ACLs +mkdir -p pure/d1/d2 +genfile --file pure/d1/f2a +genfile --file pure/d1/f2b +genfile --file pure/d1/d2/f3a +genfile --file pure/d1/d2/f3b +setfacl -m g:\$MYGROUP:r-x pure/d1 +setfacl -d -m g:\$MYGROUP:rwx pure/d1 +setfacl -d -m u:\$MYNAME:rwx pure/d1 +# \"*a\" files have \"some\" additional ACLs +setfacl -m u:\$MYNAME:--- pure/d1/d2/f3a +setfacl -m u:\$MYNAME:--- pure/d1/f2a -# clear the directory -rm -rf dir +# use default format (no acls stored) +tar -cf noacl.tar -C pure d1 -# ================================================ -# check if selinux contexts are correctly restored +# use posix format, acls stored +tar --acls -cf acl.tar -C pure d1 -tar --selinux -xf archive.tar +# Directory names are chosen based on \"how the files were extracted from +# archive\". Equivalent no* tags are used also: +# ^sacl_ — extracted archive has stored ACLs +# _def_ — target directory (-C) has default ACLs +# _optacl\$ — extraction was done with --acls option -# archive for later debugging -cp archive.tar archive_origin.tar +mkdir sacl_def_optacl +mkdir sacl_def_optnoacl +mkdir sacl_nodef_optacl +mkdir sacl_nodef_optnoacl +mkdir nosacl_def_optacl +mkdir nosacl_def_optnoacl +mkdir nosacl_nodef_optacl +mkdir nosacl_nodef_optnoacl -# check if selinux contexts were restored -getfattr -h -d dir dir/file dir/link -msecurity.selinux | \\ - grep -v -e '^#' -e ^\$ | cut -d: -f1 +setfacl -d -m u:\$MYNAME:--- nosacl_def_optnoacl sacl_def_optnoacl sacl_def_optacl nosacl_def_optacl +setfacl -d -m g:\$MYGROUP:--- nosacl_def_optnoacl sacl_def_optnoacl sacl_def_optacl nosacl_def_optacl -# =========================================================================== -# check if selinux contexts are not restored when --selinux option is missing +tar -xf acl.tar -C sacl_nodef_optnoacl +tar --acls -xf acl.tar -C sacl_nodef_optacl +tar -xf acl.tar -C sacl_def_optnoacl +tar --acls -xf acl.tar -C sacl_def_optacl +tar -xf noacl.tar -C nosacl_def_optnoacl +# _NO_ ACLs in output +tar -xf noacl.tar -C nosacl_nodef_optnoacl +tar -xf noacl.tar -C nosacl_nodef_optacl +tar -cf noacl_repackaged.tar -C nosacl_nodef_optnoacl d1 +# _NO_ ACLs in output (even when default ACLs exist) +tar --acls -xf noacl_repackaged.tar -C nosacl_def_optacl -getfattr -h -d -msecurity.selinux dir dir/file dir/link > with_selinux -rm -rf dir -tar -xf archive.tar -getfattr -h -d -msecurity.selinux dir dir/file dir/link > without_selinux -diff with_selinux without_selinux > diff_with_without -if test \"\$?\" -eq \"0\"; then - echo \"selinux contexts probably restored while --selinux is off\" -fi + cd pure + pure=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. -# ================================================================= -# check if selinux is not archived when --selinux option is missing -tar -cf archive.tar dir -# clear the directory -rm -rf dir + cd sacl_def_optacl + sacl_def_optacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. -# restore (with --selinux) -tar --selinux -xf archive.tar dir -getfattr -h -d -msecurity.selinux dir dir/file dir/link > final -diff start final > final_diff -if test \"\$?\" -ne \"0\"; then - echo \"bad result\" -fi + cd sacl_def_optnoacl + sacl_def_optnoacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. + + + cd sacl_nodef_optacl + sacl_nodef_optacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. + + + cd sacl_nodef_optnoacl + sacl_nodef_optnoacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. + + + cd nosacl_def_optacl + nosacl_def_optacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. + + + cd nosacl_def_optnoacl + nosacl_def_optnoacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. + + + cd nosacl_nodef_optacl + nosacl_nodef_optacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. + + + cd nosacl_nodef_optnoacl + nosacl_nodef_optnoacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. + + + + echo \"\$pure\" > pure.log + echo \"\$sacl_def_optacl\" > sacl_def_optacl.log + if test ! \"\$pure\" \"=\" \"\$sacl_def_optacl\"; then + echo \"bad 'pure' against 'sacl_def_optacl' output\" + fi + + + + echo \"\$sacl_def_optacl\" > sacl_def_optacl.log + echo \"\$sacl_nodef_optacl\" > sacl_nodef_optacl.log + if test ! \"\$sacl_def_optacl\" \"=\" \"\$sacl_nodef_optacl\"; then + echo \"bad 'sacl_def_optacl' against 'sacl_nodef_optacl' output\" + fi + + + echo \"\$sacl_def_optnoacl\" > sacl_def_optnoacl.log + echo \"\$nosacl_def_optnoacl\" > nosacl_def_optnoacl.log + if test ! \"\$sacl_def_optnoacl\" \"=\" \"\$nosacl_def_optnoacl\"; then + echo \"bad 'sacl_def_optnoacl' against 'nosacl_def_optnoacl' output\" + fi + + + echo \"\$sacl_nodef_optnoacl\" > sacl_nodef_optnoacl.log + echo \"\$nosacl_nodef_optnoacl\" > nosacl_nodef_optnoacl.log + if test ! \"\$sacl_nodef_optnoacl\" \"=\" \"\$nosacl_nodef_optnoacl\"; then + echo \"bad 'sacl_nodef_optnoacl' against 'nosacl_nodef_optnoacl' output\" + fi + + + echo \"\$nosacl_def_optacl\" > nosacl_def_optacl.log + echo \"\$nosacl_nodef_optacl\" > nosacl_nodef_optacl.log + if test ! \"\$nosacl_def_optacl\" \"=\" \"\$nosacl_nodef_optacl\"; then + echo \"bad 'nosacl_def_optacl' against 'nosacl_nodef_optacl' output\" + fi + + + echo \"\$nosacl_def_optacl\" > nosacl_def_optacl.log + echo \"\$nosacl_nodef_optnoacl\" > nosacl_nodef_optnoacl.log + if test ! \"\$nosacl_def_optacl\" \"=\" \"\$nosacl_nodef_optnoacl\"; then + echo \"bad 'nosacl_def_optacl' against 'nosacl_nodef_optnoacl' output\" + fi + + + + echo \"\$sacl_def_optacl\" > sacl_def_optacl.log + echo \"\$sacl_def_optnoacl\" > sacl_def_optnoacl.log + if test ! \"\$sacl_def_optacl\" \"!=\" \"\$sacl_def_optnoacl\"; then + echo \"bad 'sacl_def_optacl' against 'sacl_def_optnoacl' output\" + fi + + + echo \"\$sacl_def_optacl\" > sacl_def_optacl.log + echo \"\$nosacl_def_optnoacl\" > nosacl_def_optnoacl.log + if test ! \"\$sacl_def_optacl\" \"!=\" \"\$nosacl_def_optnoacl\"; then + echo \"bad 'sacl_def_optacl' against 'nosacl_def_optnoacl' output\" + fi + + + echo \"\$nosacl_def_optnoacl\" > nosacl_def_optnoacl.log + echo \"\$nosacl_nodef_optnoacl\" > nosacl_nodef_optnoacl.log + if test ! \"\$nosacl_def_optnoacl\" \"!=\" \"\$nosacl_nodef_optnoacl\"; then + echo \"bad 'nosacl_def_optnoacl' against 'nosacl_nodef_optnoacl' output\" + fi )" -at_fn_check_prepare_notrace 'a $(...) command substitution' "selnx01.at:28" +at_fn_check_prepare_notrace 'a `...` command substitution' "acls03.at:47" ( $at_check_trace; -mkdir ustar -(cd ustar -TEST_TAR_FORMAT=ustar +mkdir oldgnu +(cd oldgnu +TEST_TAR_FORMAT=oldgnu export TEST_TAR_FORMAT -TAR_OPTIONS="-H ustar" +TAR_OPTIONS="-H oldgnu" export TAR_OPTIONS rm -rf * @@ -39961,13 +40568,13 @@ rm -rf * file=$(TMPDIR=. mktemp fiXXXXXX) - restorecon $file &> /dev/null + setfacl -m u:$UID:rwx $file &> /dev/null if test "$?" != 0; then exit 77 fi - chcon -h --user=unconfined_u $file &> /dev/null + getfacl $file &> /dev/null if test "$?" != 0; then exit 77 fi @@ -39975,92 +40582,197 @@ rm -rf * rm -rf $file file=$(TMPDIR=. mktemp fiXXXXXX) - err=$( tar --selinux -cf /dev/null $file 2>&1 >/dev/null | wc -l ) + setfacl -m u:$UID:rwx $file + err=$( tar --acls -cf /dev/null $file 2>&1 >/dev/null | wc -l ) if test "$err" != "0"; then exit 77 fi -mkdir dir -genfile --file dir/file -ln -s file dir/link +test -z "`sort < /dev/null 2>&1`" || exit 77 -getfattr -h -d -msecurity.selinux dir dir/file dir/link > start -restorecon -R dir -chcon -h --user=system_u dir -chcon -h --user=unconfined_u dir/file -chcon -h --user=system_u dir/link +MYNAME=$( id -un ) +MYGROUP=$( id -gn ) -# archive whole directory including selinux contexts -tar --selinux -cf archive.tar dir +# Prepare directory structure with default ACLs +mkdir -p pure/d1/d2 +genfile --file pure/d1/f2a +genfile --file pure/d1/f2b +genfile --file pure/d1/d2/f3a +genfile --file pure/d1/d2/f3b +setfacl -m g:$MYGROUP:r-x pure/d1 +setfacl -d -m g:$MYGROUP:rwx pure/d1 +setfacl -d -m u:$MYNAME:rwx pure/d1 +# "*a" files have "some" additional ACLs +setfacl -m u:$MYNAME:--- pure/d1/d2/f3a +setfacl -m u:$MYNAME:--- pure/d1/f2a -# clear the directory -rm -rf dir +# use default format (no acls stored) +tar -cf noacl.tar -C pure d1 -# ================================================ -# check if selinux contexts are correctly restored +# use posix format, acls stored +tar --acls -cf acl.tar -C pure d1 -tar --selinux -xf archive.tar +# Directory names are chosen based on "how the files were extracted from +# archive". Equivalent no* tags are used also: +# ^sacl_ — extracted archive has stored ACLs +# _def_ — target directory (-C) has default ACLs +# _optacl$ — extraction was done with --acls option -# archive for later debugging -cp archive.tar archive_origin.tar +mkdir sacl_def_optacl +mkdir sacl_def_optnoacl +mkdir sacl_nodef_optacl +mkdir sacl_nodef_optnoacl +mkdir nosacl_def_optacl +mkdir nosacl_def_optnoacl +mkdir nosacl_nodef_optacl +mkdir nosacl_nodef_optnoacl -# check if selinux contexts were restored -getfattr -h -d dir dir/file dir/link -msecurity.selinux | \ - grep -v -e '^#' -e ^$ | cut -d: -f1 +setfacl -d -m u:$MYNAME:--- nosacl_def_optnoacl sacl_def_optnoacl sacl_def_optacl nosacl_def_optacl +setfacl -d -m g:$MYGROUP:--- nosacl_def_optnoacl sacl_def_optnoacl sacl_def_optacl nosacl_def_optacl -# =========================================================================== -# check if selinux contexts are not restored when --selinux option is missing +tar -xf acl.tar -C sacl_nodef_optnoacl +tar --acls -xf acl.tar -C sacl_nodef_optacl +tar -xf acl.tar -C sacl_def_optnoacl +tar --acls -xf acl.tar -C sacl_def_optacl +tar -xf noacl.tar -C nosacl_def_optnoacl +# _NO_ ACLs in output +tar -xf noacl.tar -C nosacl_nodef_optnoacl +tar -xf noacl.tar -C nosacl_nodef_optacl +tar -cf noacl_repackaged.tar -C nosacl_nodef_optnoacl d1 +# _NO_ ACLs in output (even when default ACLs exist) +tar --acls -xf noacl_repackaged.tar -C nosacl_def_optacl -getfattr -h -d -msecurity.selinux dir dir/file dir/link > with_selinux -rm -rf dir -tar -xf archive.tar -getfattr -h -d -msecurity.selinux dir dir/file dir/link > without_selinux -diff with_selinux without_selinux > diff_with_without -if test "$?" -eq "0"; then - echo "selinux contexts probably restored while --selinux is off" -fi + cd pure + pure="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. -# ================================================================= -# check if selinux is not archived when --selinux option is missing -tar -cf archive.tar dir -# clear the directory -rm -rf dir + cd sacl_def_optacl + sacl_def_optacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. -# restore (with --selinux) -tar --selinux -xf archive.tar dir -getfattr -h -d -msecurity.selinux dir dir/file dir/link > final -diff start final > final_diff -if test "$?" -ne "0"; then - echo "bad result" -fi + cd sacl_def_optnoacl + sacl_def_optnoacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd sacl_nodef_optacl + sacl_nodef_optacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd sacl_nodef_optnoacl + sacl_nodef_optnoacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd nosacl_def_optacl + nosacl_def_optacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd nosacl_def_optnoacl + nosacl_def_optnoacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd nosacl_nodef_optacl + nosacl_nodef_optacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd nosacl_nodef_optnoacl + nosacl_nodef_optnoacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + + echo "$pure" > pure.log + echo "$sacl_def_optacl" > sacl_def_optacl.log + if test ! "$pure" "=" "$sacl_def_optacl"; then + echo "bad 'pure' against 'sacl_def_optacl' output" + fi + + + + echo "$sacl_def_optacl" > sacl_def_optacl.log + echo "$sacl_nodef_optacl" > sacl_nodef_optacl.log + if test ! "$sacl_def_optacl" "=" "$sacl_nodef_optacl"; then + echo "bad 'sacl_def_optacl' against 'sacl_nodef_optacl' output" + fi + + + echo "$sacl_def_optnoacl" > sacl_def_optnoacl.log + echo "$nosacl_def_optnoacl" > nosacl_def_optnoacl.log + if test ! "$sacl_def_optnoacl" "=" "$nosacl_def_optnoacl"; then + echo "bad 'sacl_def_optnoacl' against 'nosacl_def_optnoacl' output" + fi + + + echo "$sacl_nodef_optnoacl" > sacl_nodef_optnoacl.log + echo "$nosacl_nodef_optnoacl" > nosacl_nodef_optnoacl.log + if test ! "$sacl_nodef_optnoacl" "=" "$nosacl_nodef_optnoacl"; then + echo "bad 'sacl_nodef_optnoacl' against 'nosacl_nodef_optnoacl' output" + fi + + + echo "$nosacl_def_optacl" > nosacl_def_optacl.log + echo "$nosacl_nodef_optacl" > nosacl_nodef_optacl.log + if test ! "$nosacl_def_optacl" "=" "$nosacl_nodef_optacl"; then + echo "bad 'nosacl_def_optacl' against 'nosacl_nodef_optacl' output" + fi + + + echo "$nosacl_def_optacl" > nosacl_def_optacl.log + echo "$nosacl_nodef_optnoacl" > nosacl_nodef_optnoacl.log + if test ! "$nosacl_def_optacl" "=" "$nosacl_nodef_optnoacl"; then + echo "bad 'nosacl_def_optacl' against 'nosacl_nodef_optnoacl' output" + fi + + + + echo "$sacl_def_optacl" > sacl_def_optacl.log + echo "$sacl_def_optnoacl" > sacl_def_optnoacl.log + if test ! "$sacl_def_optacl" "!=" "$sacl_def_optnoacl"; then + echo "bad 'sacl_def_optacl' against 'sacl_def_optnoacl' output" + fi + + + echo "$sacl_def_optacl" > sacl_def_optacl.log + echo "$nosacl_def_optnoacl" > nosacl_def_optnoacl.log + if test ! "$sacl_def_optacl" "!=" "$nosacl_def_optnoacl"; then + echo "bad 'sacl_def_optacl' against 'nosacl_def_optnoacl' output" + fi + + + echo "$nosacl_def_optnoacl" > nosacl_def_optnoacl.log + echo "$nosacl_nodef_optnoacl" > nosacl_nodef_optnoacl.log + if test ! "$nosacl_def_optnoacl" "!=" "$nosacl_nodef_optnoacl"; then + echo "bad 'nosacl_def_optnoacl' against 'nosacl_nodef_optnoacl' output" + fi ) ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: -echo >>"$at_stdout"; $as_echo "security.selinux=\"system_u -security.selinux=\"unconfined_u -security.selinux=\"system_u -" | \ - $at_diff - "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/selnx01.at:28" +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/acls03.at:47" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/selnx01.at:28: -mkdir posix -(cd posix -TEST_TAR_FORMAT=posix +$as_echo "$at_srcdir/acls03.at:47: +mkdir ustar +(cd ustar +TEST_TAR_FORMAT=ustar export TEST_TAR_FORMAT -TAR_OPTIONS=\"-H posix\" +TAR_OPTIONS=\"-H ustar\" export TAR_OPTIONS rm -rf * @@ -40083,13 +40795,13 @@ rm -rf * file=\$(TMPDIR=. mktemp fiXXXXXX) - restorecon \$file &> /dev/null + setfacl -m u:\$UID:rwx \$file &> /dev/null if test \"\$?\" != 0; then exit 77 fi - chcon -h --user=unconfined_u \$file &> /dev/null + getfacl \$file &> /dev/null if test \"\$?\" != 0; then exit 77 fi @@ -40097,79 +40809,188 @@ rm -rf * rm -rf \$file file=\$(TMPDIR=. mktemp fiXXXXXX) - err=\$( tar --selinux -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) + setfacl -m u:\$UID:rwx \$file + err=\$( tar --acls -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) if test \"\$err\" != \"0\"; then exit 77 fi -mkdir dir -genfile --file dir/file -ln -s file dir/link +test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 -getfattr -h -d -msecurity.selinux dir dir/file dir/link > start -restorecon -R dir -chcon -h --user=system_u dir -chcon -h --user=unconfined_u dir/file -chcon -h --user=system_u dir/link +MYNAME=\$( id -un ) +MYGROUP=\$( id -gn ) -# archive whole directory including selinux contexts -tar --selinux -cf archive.tar dir +# Prepare directory structure with default ACLs +mkdir -p pure/d1/d2 +genfile --file pure/d1/f2a +genfile --file pure/d1/f2b +genfile --file pure/d1/d2/f3a +genfile --file pure/d1/d2/f3b +setfacl -m g:\$MYGROUP:r-x pure/d1 +setfacl -d -m g:\$MYGROUP:rwx pure/d1 +setfacl -d -m u:\$MYNAME:rwx pure/d1 +# \"*a\" files have \"some\" additional ACLs +setfacl -m u:\$MYNAME:--- pure/d1/d2/f3a +setfacl -m u:\$MYNAME:--- pure/d1/f2a -# clear the directory -rm -rf dir +# use default format (no acls stored) +tar -cf noacl.tar -C pure d1 -# ================================================ -# check if selinux contexts are correctly restored +# use posix format, acls stored +tar --acls -cf acl.tar -C pure d1 -tar --selinux -xf archive.tar +# Directory names are chosen based on \"how the files were extracted from +# archive\". Equivalent no* tags are used also: +# ^sacl_ — extracted archive has stored ACLs +# _def_ — target directory (-C) has default ACLs +# _optacl\$ — extraction was done with --acls option -# archive for later debugging -cp archive.tar archive_origin.tar +mkdir sacl_def_optacl +mkdir sacl_def_optnoacl +mkdir sacl_nodef_optacl +mkdir sacl_nodef_optnoacl +mkdir nosacl_def_optacl +mkdir nosacl_def_optnoacl +mkdir nosacl_nodef_optacl +mkdir nosacl_nodef_optnoacl -# check if selinux contexts were restored -getfattr -h -d dir dir/file dir/link -msecurity.selinux | \\ - grep -v -e '^#' -e ^\$ | cut -d: -f1 +setfacl -d -m u:\$MYNAME:--- nosacl_def_optnoacl sacl_def_optnoacl sacl_def_optacl nosacl_def_optacl +setfacl -d -m g:\$MYGROUP:--- nosacl_def_optnoacl sacl_def_optnoacl sacl_def_optacl nosacl_def_optacl -# =========================================================================== -# check if selinux contexts are not restored when --selinux option is missing +tar -xf acl.tar -C sacl_nodef_optnoacl +tar --acls -xf acl.tar -C sacl_nodef_optacl +tar -xf acl.tar -C sacl_def_optnoacl +tar --acls -xf acl.tar -C sacl_def_optacl +tar -xf noacl.tar -C nosacl_def_optnoacl +# _NO_ ACLs in output +tar -xf noacl.tar -C nosacl_nodef_optnoacl +tar -xf noacl.tar -C nosacl_nodef_optacl +tar -cf noacl_repackaged.tar -C nosacl_nodef_optnoacl d1 +# _NO_ ACLs in output (even when default ACLs exist) +tar --acls -xf noacl_repackaged.tar -C nosacl_def_optacl -getfattr -h -d -msecurity.selinux dir dir/file dir/link > with_selinux -rm -rf dir -tar -xf archive.tar -getfattr -h -d -msecurity.selinux dir dir/file dir/link > without_selinux -diff with_selinux without_selinux > diff_with_without -if test \"\$?\" -eq \"0\"; then - echo \"selinux contexts probably restored while --selinux is off\" -fi + cd pure + pure=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. -# ================================================================= -# check if selinux is not archived when --selinux option is missing -tar -cf archive.tar dir -# clear the directory -rm -rf dir + cd sacl_def_optacl + sacl_def_optacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. -# restore (with --selinux) -tar --selinux -xf archive.tar dir -getfattr -h -d -msecurity.selinux dir dir/file dir/link > final -diff start final > final_diff -if test \"\$?\" -ne \"0\"; then - echo \"bad result\" -fi + cd sacl_def_optnoacl + sacl_def_optnoacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. + + + cd sacl_nodef_optacl + sacl_nodef_optacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. + + + cd sacl_nodef_optnoacl + sacl_nodef_optnoacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. + + + cd nosacl_def_optacl + nosacl_def_optacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. + + + cd nosacl_def_optnoacl + nosacl_def_optnoacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. + + + cd nosacl_nodef_optacl + nosacl_nodef_optacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. + + + cd nosacl_nodef_optnoacl + nosacl_nodef_optnoacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. + + + + echo \"\$pure\" > pure.log + echo \"\$sacl_def_optacl\" > sacl_def_optacl.log + if test ! \"\$pure\" \"=\" \"\$sacl_def_optacl\"; then + echo \"bad 'pure' against 'sacl_def_optacl' output\" + fi + + + + echo \"\$sacl_def_optacl\" > sacl_def_optacl.log + echo \"\$sacl_nodef_optacl\" > sacl_nodef_optacl.log + if test ! \"\$sacl_def_optacl\" \"=\" \"\$sacl_nodef_optacl\"; then + echo \"bad 'sacl_def_optacl' against 'sacl_nodef_optacl' output\" + fi + + + echo \"\$sacl_def_optnoacl\" > sacl_def_optnoacl.log + echo \"\$nosacl_def_optnoacl\" > nosacl_def_optnoacl.log + if test ! \"\$sacl_def_optnoacl\" \"=\" \"\$nosacl_def_optnoacl\"; then + echo \"bad 'sacl_def_optnoacl' against 'nosacl_def_optnoacl' output\" + fi + + + echo \"\$sacl_nodef_optnoacl\" > sacl_nodef_optnoacl.log + echo \"\$nosacl_nodef_optnoacl\" > nosacl_nodef_optnoacl.log + if test ! \"\$sacl_nodef_optnoacl\" \"=\" \"\$nosacl_nodef_optnoacl\"; then + echo \"bad 'sacl_nodef_optnoacl' against 'nosacl_nodef_optnoacl' output\" + fi + + + echo \"\$nosacl_def_optacl\" > nosacl_def_optacl.log + echo \"\$nosacl_nodef_optacl\" > nosacl_nodef_optacl.log + if test ! \"\$nosacl_def_optacl\" \"=\" \"\$nosacl_nodef_optacl\"; then + echo \"bad 'nosacl_def_optacl' against 'nosacl_nodef_optacl' output\" + fi + + + echo \"\$nosacl_def_optacl\" > nosacl_def_optacl.log + echo \"\$nosacl_nodef_optnoacl\" > nosacl_nodef_optnoacl.log + if test ! \"\$nosacl_def_optacl\" \"=\" \"\$nosacl_nodef_optnoacl\"; then + echo \"bad 'nosacl_def_optacl' against 'nosacl_nodef_optnoacl' output\" + fi + + + + echo \"\$sacl_def_optacl\" > sacl_def_optacl.log + echo \"\$sacl_def_optnoacl\" > sacl_def_optnoacl.log + if test ! \"\$sacl_def_optacl\" \"!=\" \"\$sacl_def_optnoacl\"; then + echo \"bad 'sacl_def_optacl' against 'sacl_def_optnoacl' output\" + fi + + + echo \"\$sacl_def_optacl\" > sacl_def_optacl.log + echo \"\$nosacl_def_optnoacl\" > nosacl_def_optnoacl.log + if test ! \"\$sacl_def_optacl\" \"!=\" \"\$nosacl_def_optnoacl\"; then + echo \"bad 'sacl_def_optacl' against 'nosacl_def_optnoacl' output\" + fi + + + echo \"\$nosacl_def_optnoacl\" > nosacl_def_optnoacl.log + echo \"\$nosacl_nodef_optnoacl\" > nosacl_nodef_optnoacl.log + if test ! \"\$nosacl_def_optnoacl\" \"!=\" \"\$nosacl_nodef_optnoacl\"; then + echo \"bad 'nosacl_def_optnoacl' against 'nosacl_nodef_optnoacl' output\" + fi )" -at_fn_check_prepare_notrace 'a $(...) command substitution' "selnx01.at:28" +at_fn_check_prepare_notrace 'a `...` command substitution' "acls03.at:47" ( $at_check_trace; -mkdir posix -(cd posix -TEST_TAR_FORMAT=posix +mkdir ustar +(cd ustar +TEST_TAR_FORMAT=ustar export TEST_TAR_FORMAT -TAR_OPTIONS="-H posix" +TAR_OPTIONS="-H ustar" export TAR_OPTIONS rm -rf * @@ -40192,13 +41013,13 @@ rm -rf * file=$(TMPDIR=. mktemp fiXXXXXX) - restorecon $file &> /dev/null + setfacl -m u:$UID:rwx $file &> /dev/null if test "$?" != 0; then exit 77 fi - chcon -h --user=unconfined_u $file &> /dev/null + getfacl $file &> /dev/null if test "$?" != 0; then exit 77 fi @@ -40206,465 +41027,419 @@ rm -rf * rm -rf $file file=$(TMPDIR=. mktemp fiXXXXXX) - err=$( tar --selinux -cf /dev/null $file 2>&1 >/dev/null | wc -l ) + setfacl -m u:$UID:rwx $file + err=$( tar --acls -cf /dev/null $file 2>&1 >/dev/null | wc -l ) if test "$err" != "0"; then exit 77 fi -mkdir dir -genfile --file dir/file -ln -s file dir/link +test -z "`sort < /dev/null 2>&1`" || exit 77 -getfattr -h -d -msecurity.selinux dir dir/file dir/link > start -restorecon -R dir -chcon -h --user=system_u dir -chcon -h --user=unconfined_u dir/file -chcon -h --user=system_u dir/link +MYNAME=$( id -un ) +MYGROUP=$( id -gn ) -# archive whole directory including selinux contexts -tar --selinux -cf archive.tar dir +# Prepare directory structure with default ACLs +mkdir -p pure/d1/d2 +genfile --file pure/d1/f2a +genfile --file pure/d1/f2b +genfile --file pure/d1/d2/f3a +genfile --file pure/d1/d2/f3b +setfacl -m g:$MYGROUP:r-x pure/d1 +setfacl -d -m g:$MYGROUP:rwx pure/d1 +setfacl -d -m u:$MYNAME:rwx pure/d1 +# "*a" files have "some" additional ACLs +setfacl -m u:$MYNAME:--- pure/d1/d2/f3a +setfacl -m u:$MYNAME:--- pure/d1/f2a -# clear the directory -rm -rf dir +# use default format (no acls stored) +tar -cf noacl.tar -C pure d1 -# ================================================ -# check if selinux contexts are correctly restored +# use posix format, acls stored +tar --acls -cf acl.tar -C pure d1 -tar --selinux -xf archive.tar +# Directory names are chosen based on "how the files were extracted from +# archive". Equivalent no* tags are used also: +# ^sacl_ — extracted archive has stored ACLs +# _def_ — target directory (-C) has default ACLs +# _optacl$ — extraction was done with --acls option -# archive for later debugging -cp archive.tar archive_origin.tar +mkdir sacl_def_optacl +mkdir sacl_def_optnoacl +mkdir sacl_nodef_optacl +mkdir sacl_nodef_optnoacl +mkdir nosacl_def_optacl +mkdir nosacl_def_optnoacl +mkdir nosacl_nodef_optacl +mkdir nosacl_nodef_optnoacl -# check if selinux contexts were restored -getfattr -h -d dir dir/file dir/link -msecurity.selinux | \ - grep -v -e '^#' -e ^$ | cut -d: -f1 +setfacl -d -m u:$MYNAME:--- nosacl_def_optnoacl sacl_def_optnoacl sacl_def_optacl nosacl_def_optacl +setfacl -d -m g:$MYGROUP:--- nosacl_def_optnoacl sacl_def_optnoacl sacl_def_optacl nosacl_def_optacl -# =========================================================================== -# check if selinux contexts are not restored when --selinux option is missing +tar -xf acl.tar -C sacl_nodef_optnoacl +tar --acls -xf acl.tar -C sacl_nodef_optacl +tar -xf acl.tar -C sacl_def_optnoacl +tar --acls -xf acl.tar -C sacl_def_optacl +tar -xf noacl.tar -C nosacl_def_optnoacl +# _NO_ ACLs in output +tar -xf noacl.tar -C nosacl_nodef_optnoacl +tar -xf noacl.tar -C nosacl_nodef_optacl +tar -cf noacl_repackaged.tar -C nosacl_nodef_optnoacl d1 +# _NO_ ACLs in output (even when default ACLs exist) +tar --acls -xf noacl_repackaged.tar -C nosacl_def_optacl -getfattr -h -d -msecurity.selinux dir dir/file dir/link > with_selinux -rm -rf dir -tar -xf archive.tar -getfattr -h -d -msecurity.selinux dir dir/file dir/link > without_selinux -diff with_selinux without_selinux > diff_with_without -if test "$?" -eq "0"; then - echo "selinux contexts probably restored while --selinux is off" -fi + cd pure + pure="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. -# ================================================================= -# check if selinux is not archived when --selinux option is missing -tar -cf archive.tar dir -# clear the directory -rm -rf dir + cd sacl_def_optacl + sacl_def_optacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. -# restore (with --selinux) -tar --selinux -xf archive.tar dir -getfattr -h -d -msecurity.selinux dir dir/file dir/link > final -diff start final > final_diff -if test "$?" -ne "0"; then - echo "bad result" -fi + cd sacl_def_optnoacl + sacl_def_optnoacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. -) -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo >>"$at_stdout"; $as_echo "security.selinux=\"system_u -security.selinux=\"unconfined_u -security.selinux=\"system_u -" | \ - $at_diff - "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/selnx01.at:28" -$at_failed && at_fn_log_failure -$at_traceon; } - { set +x -$as_echo "$at_srcdir/selnx01.at:28: -mkdir gnu -(cd gnu -TEST_TAR_FORMAT=gnu -export TEST_TAR_FORMAT -TAR_OPTIONS=\"-H gnu\" -export TAR_OPTIONS -rm -rf * + cd sacl_nodef_optacl + sacl_nodef_optacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. - file=\$(TMPDIR=. mktemp fiXXXXXX) + cd sacl_nodef_optnoacl + sacl_nodef_optnoacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. - setfattr -n user.test -v test \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi + cd nosacl_def_optacl + nosacl_def_optacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. - getfattr \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi + cd nosacl_def_optnoacl + nosacl_def_optnoacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + cd nosacl_nodef_optacl + nosacl_nodef_optacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. - file=\$(TMPDIR=. mktemp fiXXXXXX) - restorecon \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi + cd nosacl_nodef_optnoacl + nosacl_nodef_optnoacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. - chcon -h --user=unconfined_u \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi - rm -rf \$file + echo "$pure" > pure.log + echo "$sacl_def_optacl" > sacl_def_optacl.log + if test ! "$pure" "=" "$sacl_def_optacl"; then + echo "bad 'pure' against 'sacl_def_optacl' output" + fi - file=\$(TMPDIR=. mktemp fiXXXXXX) - err=\$( tar --selinux -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) - if test \"\$err\" != \"0\"; then - exit 77 - fi -mkdir dir -genfile --file dir/file -ln -s file dir/link + echo "$sacl_def_optacl" > sacl_def_optacl.log + echo "$sacl_nodef_optacl" > sacl_nodef_optacl.log + if test ! "$sacl_def_optacl" "=" "$sacl_nodef_optacl"; then + echo "bad 'sacl_def_optacl' against 'sacl_nodef_optacl' output" + fi -getfattr -h -d -msecurity.selinux dir dir/file dir/link > start -restorecon -R dir -chcon -h --user=system_u dir -chcon -h --user=unconfined_u dir/file -chcon -h --user=system_u dir/link + echo "$sacl_def_optnoacl" > sacl_def_optnoacl.log + echo "$nosacl_def_optnoacl" > nosacl_def_optnoacl.log + if test ! "$sacl_def_optnoacl" "=" "$nosacl_def_optnoacl"; then + echo "bad 'sacl_def_optnoacl' against 'nosacl_def_optnoacl' output" + fi -# archive whole directory including selinux contexts -tar --selinux -cf archive.tar dir -# clear the directory -rm -rf dir + echo "$sacl_nodef_optnoacl" > sacl_nodef_optnoacl.log + echo "$nosacl_nodef_optnoacl" > nosacl_nodef_optnoacl.log + if test ! "$sacl_nodef_optnoacl" "=" "$nosacl_nodef_optnoacl"; then + echo "bad 'sacl_nodef_optnoacl' against 'nosacl_nodef_optnoacl' output" + fi -# ================================================ -# check if selinux contexts are correctly restored -tar --selinux -xf archive.tar + echo "$nosacl_def_optacl" > nosacl_def_optacl.log + echo "$nosacl_nodef_optacl" > nosacl_nodef_optacl.log + if test ! "$nosacl_def_optacl" "=" "$nosacl_nodef_optacl"; then + echo "bad 'nosacl_def_optacl' against 'nosacl_nodef_optacl' output" + fi -# archive for later debugging -cp archive.tar archive_origin.tar -# check if selinux contexts were restored -getfattr -h -d dir dir/file dir/link -msecurity.selinux | \\ - grep -v -e '^#' -e ^\$ | cut -d: -f1 + echo "$nosacl_def_optacl" > nosacl_def_optacl.log + echo "$nosacl_nodef_optnoacl" > nosacl_nodef_optnoacl.log + if test ! "$nosacl_def_optacl" "=" "$nosacl_nodef_optnoacl"; then + echo "bad 'nosacl_def_optacl' against 'nosacl_nodef_optnoacl' output" + fi -# =========================================================================== -# check if selinux contexts are not restored when --selinux option is missing -getfattr -h -d -msecurity.selinux dir dir/file dir/link > with_selinux -rm -rf dir -tar -xf archive.tar -getfattr -h -d -msecurity.selinux dir dir/file dir/link > without_selinux -diff with_selinux without_selinux > diff_with_without -if test \"\$?\" -eq \"0\"; then - echo \"selinux contexts probably restored while --selinux is off\" -fi + echo "$sacl_def_optacl" > sacl_def_optacl.log + echo "$sacl_def_optnoacl" > sacl_def_optnoacl.log + if test ! "$sacl_def_optacl" "!=" "$sacl_def_optnoacl"; then + echo "bad 'sacl_def_optacl' against 'sacl_def_optnoacl' output" + fi -# ================================================================= -# check if selinux is not archived when --selinux option is missing -tar -cf archive.tar dir + echo "$sacl_def_optacl" > sacl_def_optacl.log + echo "$nosacl_def_optnoacl" > nosacl_def_optnoacl.log + if test ! "$sacl_def_optacl" "!=" "$nosacl_def_optnoacl"; then + echo "bad 'sacl_def_optacl' against 'nosacl_def_optnoacl' output" + fi -# clear the directory -rm -rf dir -# restore (with --selinux) -tar --selinux -xf archive.tar dir + echo "$nosacl_def_optnoacl" > nosacl_def_optnoacl.log + echo "$nosacl_nodef_optnoacl" > nosacl_nodef_optnoacl.log + if test ! "$nosacl_def_optnoacl" "!=" "$nosacl_nodef_optnoacl"; then + echo "bad 'nosacl_def_optnoacl' against 'nosacl_nodef_optnoacl' output" + fi -getfattr -h -d -msecurity.selinux dir dir/file dir/link > final -diff start final > final_diff -if test \"\$?\" -ne \"0\"; then - echo \"bad result\" -fi +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/acls03.at:47" +$at_failed && at_fn_log_failure +$at_traceon; } -)" -at_fn_check_prepare_notrace 'a $(...) command substitution' "selnx01.at:28" -( $at_check_trace; -mkdir gnu -(cd gnu -TEST_TAR_FORMAT=gnu + { set +x +$as_echo "$at_srcdir/acls03.at:47: +mkdir posix +(cd posix +TEST_TAR_FORMAT=posix export TEST_TAR_FORMAT -TAR_OPTIONS="-H gnu" +TAR_OPTIONS=\"-H posix\" export TAR_OPTIONS rm -rf * - file=$(TMPDIR=. mktemp fiXXXXXX) + file=\$(TMPDIR=. mktemp fiXXXXXX) - setfattr -n user.test -v test $file &> /dev/null - if test "$?" != 0; then + setfattr -n user.test -v test \$file &> /dev/null + if test \"\$?\" != 0; then exit 77 fi - getfattr $file &> /dev/null - if test "$?" != 0; then + getfattr \$file &> /dev/null + if test \"\$?\" != 0; then exit 77 fi - file=$(TMPDIR=. mktemp fiXXXXXX) + file=\$(TMPDIR=. mktemp fiXXXXXX) - restorecon $file &> /dev/null - if test "$?" != 0; then + setfacl -m u:\$UID:rwx \$file &> /dev/null + if test \"\$?\" != 0; then exit 77 fi - chcon -h --user=unconfined_u $file &> /dev/null - if test "$?" != 0; then + getfacl \$file &> /dev/null + if test \"\$?\" != 0; then exit 77 fi - rm -rf $file + rm -rf \$file - file=$(TMPDIR=. mktemp fiXXXXXX) - err=$( tar --selinux -cf /dev/null $file 2>&1 >/dev/null | wc -l ) - if test "$err" != "0"; then + file=\$(TMPDIR=. mktemp fiXXXXXX) + setfacl -m u:\$UID:rwx \$file + err=\$( tar --acls -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) + if test \"\$err\" != \"0\"; then exit 77 fi -mkdir dir -genfile --file dir/file -ln -s file dir/link - -getfattr -h -d -msecurity.selinux dir dir/file dir/link > start - -restorecon -R dir -chcon -h --user=system_u dir -chcon -h --user=unconfined_u dir/file -chcon -h --user=system_u dir/link - -# archive whole directory including selinux contexts -tar --selinux -cf archive.tar dir - -# clear the directory -rm -rf dir - -# ================================================ -# check if selinux contexts are correctly restored - -tar --selinux -xf archive.tar - -# archive for later debugging -cp archive.tar archive_origin.tar - -# check if selinux contexts were restored -getfattr -h -d dir dir/file dir/link -msecurity.selinux | \ - grep -v -e '^#' -e ^$ | cut -d: -f1 - -# =========================================================================== -# check if selinux contexts are not restored when --selinux option is missing +test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 -getfattr -h -d -msecurity.selinux dir dir/file dir/link > with_selinux -rm -rf dir -tar -xf archive.tar -getfattr -h -d -msecurity.selinux dir dir/file dir/link > without_selinux -diff with_selinux without_selinux > diff_with_without -if test "$?" -eq "0"; then - echo "selinux contexts probably restored while --selinux is off" -fi +MYNAME=\$( id -un ) +MYGROUP=\$( id -gn ) -# ================================================================= -# check if selinux is not archived when --selinux option is missing +# Prepare directory structure with default ACLs +mkdir -p pure/d1/d2 +genfile --file pure/d1/f2a +genfile --file pure/d1/f2b +genfile --file pure/d1/d2/f3a +genfile --file pure/d1/d2/f3b +setfacl -m g:\$MYGROUP:r-x pure/d1 +setfacl -d -m g:\$MYGROUP:rwx pure/d1 +setfacl -d -m u:\$MYNAME:rwx pure/d1 +# \"*a\" files have \"some\" additional ACLs +setfacl -m u:\$MYNAME:--- pure/d1/d2/f3a +setfacl -m u:\$MYNAME:--- pure/d1/f2a -tar -cf archive.tar dir +# use default format (no acls stored) +tar -cf noacl.tar -C pure d1 -# clear the directory -rm -rf dir +# use posix format, acls stored +tar --acls -cf acl.tar -C pure d1 -# restore (with --selinux) -tar --selinux -xf archive.tar dir +# Directory names are chosen based on \"how the files were extracted from +# archive\". Equivalent no* tags are used also: +# ^sacl_ — extracted archive has stored ACLs +# _def_ — target directory (-C) has default ACLs +# _optacl\$ — extraction was done with --acls option -getfattr -h -d -msecurity.selinux dir dir/file dir/link > final -diff start final > final_diff -if test "$?" -ne "0"; then - echo "bad result" -fi +mkdir sacl_def_optacl +mkdir sacl_def_optnoacl +mkdir sacl_nodef_optacl +mkdir sacl_nodef_optnoacl +mkdir nosacl_def_optacl +mkdir nosacl_def_optnoacl +mkdir nosacl_nodef_optacl +mkdir nosacl_nodef_optnoacl -) -) >>"$at_stdout" 2>>"$at_stderr" 5>&- -at_status=$? at_failed=false -$at_check_filter -at_fn_diff_devnull "$at_stderr" || at_failed=: -echo >>"$at_stdout"; $as_echo "security.selinux=\"system_u -security.selinux=\"unconfined_u -security.selinux=\"system_u -" | \ - $at_diff - "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/selnx01.at:28" -$at_failed && at_fn_log_failure -$at_traceon; } +setfacl -d -m u:\$MYNAME:--- nosacl_def_optnoacl sacl_def_optnoacl sacl_def_optacl nosacl_def_optacl +setfacl -d -m g:\$MYGROUP:--- nosacl_def_optnoacl sacl_def_optnoacl sacl_def_optacl nosacl_def_optacl +tar -xf acl.tar -C sacl_nodef_optnoacl +tar --acls -xf acl.tar -C sacl_nodef_optacl +tar -xf acl.tar -C sacl_def_optnoacl +tar --acls -xf acl.tar -C sacl_def_optacl +tar -xf noacl.tar -C nosacl_def_optnoacl +# _NO_ ACLs in output +tar -xf noacl.tar -C nosacl_nodef_optnoacl +tar -xf noacl.tar -C nosacl_nodef_optacl +tar -cf noacl_repackaged.tar -C nosacl_nodef_optnoacl d1 +# _NO_ ACLs in output (even when default ACLs exist) +tar --acls -xf noacl_repackaged.tar -C nosacl_def_optacl + cd pure + pure=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. - set +x - $at_times_p && times >"$at_times_file" -) 5>&1 2>&1 7>&- | eval $at_tee_pipe -read at_status <"$at_status_file" -#AT_STOP_172 -#AT_START_173 -at_fn_group_banner 173 'selacl01.at:25' \ - "acls/selinux: special files & fifos" " " 25 -at_xfail=no - test -f $XFAILFILE && at_xfail=yes -( - $as_echo "173. $at_setup_line: testing $at_desc ..." - $at_traceon + cd sacl_def_optacl + sacl_def_optacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. + cd sacl_def_optnoacl + sacl_def_optnoacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. - { set +x -$as_echo "$at_srcdir/selacl01.at:28: -mkdir v7 -(cd v7 -TEST_TAR_FORMAT=v7 -export TEST_TAR_FORMAT -TAR_OPTIONS=\"-H v7\" -export TAR_OPTIONS -rm -rf * + cd sacl_nodef_optacl + sacl_nodef_optacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. -echo \"test\" > \$\$ -chmod 0 \$\$ -cat \$\$ > /dev/null 2>&1 -result=\$? -rm -f \$\$ -test \$result -eq 0 || exit 77 + cd sacl_nodef_optnoacl + sacl_nodef_optnoacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. - file=\$(TMPDIR=. mktemp fiXXXXXX) - setfattr -n user.test -v test \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi + cd nosacl_def_optacl + nosacl_def_optacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. - getfattr \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi + cd nosacl_def_optnoacl + nosacl_def_optnoacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. + cd nosacl_nodef_optacl + nosacl_nodef_optacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. - file=\$(TMPDIR=. mktemp fiXXXXXX) + cd nosacl_nodef_optnoacl + nosacl_nodef_optnoacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. - restorecon \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi - chcon -h --user=unconfined_u \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi + echo \"\$pure\" > pure.log + echo \"\$sacl_def_optacl\" > sacl_def_optacl.log + if test ! \"\$pure\" \"=\" \"\$sacl_def_optacl\"; then + echo \"bad 'pure' against 'sacl_def_optacl' output\" + fi - rm -rf \$file - file=\$(TMPDIR=. mktemp fiXXXXXX) - err=\$( tar --selinux -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) - if test \"\$err\" != \"0\"; then - exit 77 - fi + echo \"\$sacl_def_optacl\" > sacl_def_optacl.log + echo \"\$sacl_nodef_optacl\" > sacl_nodef_optacl.log + if test ! \"\$sacl_def_optacl\" \"=\" \"\$sacl_nodef_optacl\"; then + echo \"bad 'sacl_def_optacl' against 'sacl_nodef_optacl' output\" + fi - file=\$(TMPDIR=. mktemp fiXXXXXX) + echo \"\$sacl_def_optnoacl\" > sacl_def_optnoacl.log + echo \"\$nosacl_def_optnoacl\" > nosacl_def_optnoacl.log + if test ! \"\$sacl_def_optnoacl\" \"=\" \"\$nosacl_def_optnoacl\"; then + echo \"bad 'sacl_def_optnoacl' against 'nosacl_def_optnoacl' output\" + fi - setfacl -m u:\$UID:rwx \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi + echo \"\$sacl_nodef_optnoacl\" > sacl_nodef_optnoacl.log + echo \"\$nosacl_nodef_optnoacl\" > nosacl_nodef_optnoacl.log + if test ! \"\$sacl_nodef_optnoacl\" \"=\" \"\$nosacl_nodef_optnoacl\"; then + echo \"bad 'sacl_nodef_optnoacl' against 'nosacl_nodef_optnoacl' output\" + fi - getfacl \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi - rm -rf \$file + echo \"\$nosacl_def_optacl\" > nosacl_def_optacl.log + echo \"\$nosacl_nodef_optacl\" > nosacl_nodef_optacl.log + if test ! \"\$nosacl_def_optacl\" \"=\" \"\$nosacl_nodef_optacl\"; then + echo \"bad 'nosacl_def_optacl' against 'nosacl_nodef_optacl' output\" + fi - file=\$(TMPDIR=. mktemp fiXXXXXX) - setfacl -m u:\$UID:rwx \$file - err=\$( tar --acls -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) - if test \"\$err\" != \"0\"; then - exit 77 - fi + echo \"\$nosacl_def_optacl\" > nosacl_def_optacl.log + echo \"\$nosacl_nodef_optnoacl\" > nosacl_nodef_optnoacl.log + if test ! \"\$nosacl_def_optacl\" \"=\" \"\$nosacl_nodef_optnoacl\"; then + echo \"bad 'nosacl_def_optacl' against 'nosacl_nodef_optnoacl' output\" + fi -mkdir dir -mkfifo dir/fifo -MAJOR=\$( stat /dev/urandom --printf=\"%t\" ) -MINOR=\$( stat /dev/urandom --printf=\"%T\" ) -mknod dir/chartype c \$MAJOR \$MINOR -# setup attributes -restorecon -R dir -chcon -h --user=system_u dir/fifo -chcon -h --user=system_u dir/chartype -setfacl -m u:\$UID:--- dir/fifo -setfacl -m u:\$UID:rwx dir/chartype -getfacl dir/fifo >> before -getfattr -msecurity.selinux dir/chartype >> before + echo \"\$sacl_def_optacl\" > sacl_def_optacl.log + echo \"\$sacl_def_optnoacl\" > sacl_def_optnoacl.log + if test ! \"\$sacl_def_optacl\" \"!=\" \"\$sacl_def_optnoacl\"; then + echo \"bad 'sacl_def_optacl' against 'sacl_def_optnoacl' output\" + fi -tar --xattrs --selinux --acls -cf archive.tar dir -mv dir olddir + echo \"\$sacl_def_optacl\" > sacl_def_optacl.log + echo \"\$nosacl_def_optnoacl\" > nosacl_def_optnoacl.log + if test ! \"\$sacl_def_optacl\" \"!=\" \"\$nosacl_def_optnoacl\"; then + echo \"bad 'sacl_def_optacl' against 'nosacl_def_optnoacl' output\" + fi -tar --xattrs --selinux --acls -xf archive.tar -getfacl dir/fifo >> after -getfattr -msecurity.selinux dir/chartype >> after + echo \"\$nosacl_def_optnoacl\" > nosacl_def_optnoacl.log + echo \"\$nosacl_nodef_optnoacl\" > nosacl_nodef_optnoacl.log + if test ! \"\$nosacl_def_optnoacl\" \"!=\" \"\$nosacl_nodef_optnoacl\"; then + echo \"bad 'nosacl_def_optnoacl' against 'nosacl_nodef_optnoacl' output\" + fi -diff before after -echo separator )" -at_fn_check_prepare_notrace 'a $(...) command substitution' "selacl01.at:28" +at_fn_check_prepare_notrace 'a `...` command substitution' "acls03.at:47" ( $at_check_trace; -mkdir v7 -(cd v7 -TEST_TAR_FORMAT=v7 +mkdir posix +(cd posix +TEST_TAR_FORMAT=posix export TEST_TAR_FORMAT -TAR_OPTIONS="-H v7" +TAR_OPTIONS="-H posix" export TAR_OPTIONS rm -rf * -echo "test" > $$ -chmod 0 $$ -cat $$ > /dev/null 2>&1 -result=$? -rm -f $$ -test $result -eq 0 || exit 77 - - file=$(TMPDIR=. mktemp fiXXXXXX) setfattr -n user.test -v test $file &> /dev/null @@ -40683,13 +41458,13 @@ test $result -eq 0 || exit 77 file=$(TMPDIR=. mktemp fiXXXXXX) - restorecon $file &> /dev/null + setfacl -m u:$UID:rwx $file &> /dev/null if test "$?" != 0; then exit 77 fi - chcon -h --user=unconfined_u $file &> /dev/null + getfacl $file &> /dev/null if test "$?" != 0; then exit 77 fi @@ -40697,94 +41472,201 @@ test $result -eq 0 || exit 77 rm -rf $file file=$(TMPDIR=. mktemp fiXXXXXX) - err=$( tar --selinux -cf /dev/null $file 2>&1 >/dev/null | wc -l ) + setfacl -m u:$UID:rwx $file + err=$( tar --acls -cf /dev/null $file 2>&1 >/dev/null | wc -l ) if test "$err" != "0"; then exit 77 fi +test -z "`sort < /dev/null 2>&1`" || exit 77 - file=$(TMPDIR=. mktemp fiXXXXXX) - setfacl -m u:$UID:rwx $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi +MYNAME=$( id -un ) +MYGROUP=$( id -gn ) +# Prepare directory structure with default ACLs +mkdir -p pure/d1/d2 +genfile --file pure/d1/f2a +genfile --file pure/d1/f2b +genfile --file pure/d1/d2/f3a +genfile --file pure/d1/d2/f3b +setfacl -m g:$MYGROUP:r-x pure/d1 +setfacl -d -m g:$MYGROUP:rwx pure/d1 +setfacl -d -m u:$MYNAME:rwx pure/d1 +# "*a" files have "some" additional ACLs +setfacl -m u:$MYNAME:--- pure/d1/d2/f3a +setfacl -m u:$MYNAME:--- pure/d1/f2a - getfacl $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi +# use default format (no acls stored) +tar -cf noacl.tar -C pure d1 - rm -rf $file +# use posix format, acls stored +tar --acls -cf acl.tar -C pure d1 - file=$(TMPDIR=. mktemp fiXXXXXX) - setfacl -m u:$UID:rwx $file - err=$( tar --acls -cf /dev/null $file 2>&1 >/dev/null | wc -l ) - if test "$err" != "0"; then - exit 77 - fi +# Directory names are chosen based on "how the files were extracted from +# archive". Equivalent no* tags are used also: +# ^sacl_ — extracted archive has stored ACLs +# _def_ — target directory (-C) has default ACLs +# _optacl$ — extraction was done with --acls option +mkdir sacl_def_optacl +mkdir sacl_def_optnoacl +mkdir sacl_nodef_optacl +mkdir sacl_nodef_optnoacl +mkdir nosacl_def_optacl +mkdir nosacl_def_optnoacl +mkdir nosacl_nodef_optacl +mkdir nosacl_nodef_optnoacl -mkdir dir -mkfifo dir/fifo -MAJOR=$( stat /dev/urandom --printf="%t" ) -MINOR=$( stat /dev/urandom --printf="%T" ) -mknod dir/chartype c $MAJOR $MINOR +setfacl -d -m u:$MYNAME:--- nosacl_def_optnoacl sacl_def_optnoacl sacl_def_optacl nosacl_def_optacl +setfacl -d -m g:$MYGROUP:--- nosacl_def_optnoacl sacl_def_optnoacl sacl_def_optacl nosacl_def_optacl -# setup attributes -restorecon -R dir -chcon -h --user=system_u dir/fifo -chcon -h --user=system_u dir/chartype -setfacl -m u:$UID:--- dir/fifo -setfacl -m u:$UID:rwx dir/chartype +tar -xf acl.tar -C sacl_nodef_optnoacl +tar --acls -xf acl.tar -C sacl_nodef_optacl +tar -xf acl.tar -C sacl_def_optnoacl +tar --acls -xf acl.tar -C sacl_def_optacl +tar -xf noacl.tar -C nosacl_def_optnoacl +# _NO_ ACLs in output +tar -xf noacl.tar -C nosacl_nodef_optnoacl +tar -xf noacl.tar -C nosacl_nodef_optacl +tar -cf noacl_repackaged.tar -C nosacl_nodef_optnoacl d1 +# _NO_ ACLs in output (even when default ACLs exist) +tar --acls -xf noacl_repackaged.tar -C nosacl_def_optacl -getfacl dir/fifo >> before -getfattr -msecurity.selinux dir/chartype >> before -tar --xattrs --selinux --acls -cf archive.tar dir + cd pure + pure="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. -mv dir olddir -tar --xattrs --selinux --acls -xf archive.tar -getfacl dir/fifo >> after -getfattr -msecurity.selinux dir/chartype >> after + cd sacl_def_optacl + sacl_def_optacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd sacl_def_optnoacl + sacl_def_optnoacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd sacl_nodef_optacl + sacl_nodef_optacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd sacl_nodef_optnoacl + sacl_nodef_optnoacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd nosacl_def_optacl + nosacl_def_optacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd nosacl_def_optnoacl + nosacl_def_optnoacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd nosacl_nodef_optacl + nosacl_nodef_optacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd nosacl_nodef_optnoacl + nosacl_nodef_optnoacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + + echo "$pure" > pure.log + echo "$sacl_def_optacl" > sacl_def_optacl.log + if test ! "$pure" "=" "$sacl_def_optacl"; then + echo "bad 'pure' against 'sacl_def_optacl' output" + fi + + + + echo "$sacl_def_optacl" > sacl_def_optacl.log + echo "$sacl_nodef_optacl" > sacl_nodef_optacl.log + if test ! "$sacl_def_optacl" "=" "$sacl_nodef_optacl"; then + echo "bad 'sacl_def_optacl' against 'sacl_nodef_optacl' output" + fi + + + echo "$sacl_def_optnoacl" > sacl_def_optnoacl.log + echo "$nosacl_def_optnoacl" > nosacl_def_optnoacl.log + if test ! "$sacl_def_optnoacl" "=" "$nosacl_def_optnoacl"; then + echo "bad 'sacl_def_optnoacl' against 'nosacl_def_optnoacl' output" + fi + + + echo "$sacl_nodef_optnoacl" > sacl_nodef_optnoacl.log + echo "$nosacl_nodef_optnoacl" > nosacl_nodef_optnoacl.log + if test ! "$sacl_nodef_optnoacl" "=" "$nosacl_nodef_optnoacl"; then + echo "bad 'sacl_nodef_optnoacl' against 'nosacl_nodef_optnoacl' output" + fi + + + echo "$nosacl_def_optacl" > nosacl_def_optacl.log + echo "$nosacl_nodef_optacl" > nosacl_nodef_optacl.log + if test ! "$nosacl_def_optacl" "=" "$nosacl_nodef_optacl"; then + echo "bad 'nosacl_def_optacl' against 'nosacl_nodef_optacl' output" + fi + + + echo "$nosacl_def_optacl" > nosacl_def_optacl.log + echo "$nosacl_nodef_optnoacl" > nosacl_nodef_optnoacl.log + if test ! "$nosacl_def_optacl" "=" "$nosacl_nodef_optnoacl"; then + echo "bad 'nosacl_def_optacl' against 'nosacl_nodef_optnoacl' output" + fi + + + + echo "$sacl_def_optacl" > sacl_def_optacl.log + echo "$sacl_def_optnoacl" > sacl_def_optnoacl.log + if test ! "$sacl_def_optacl" "!=" "$sacl_def_optnoacl"; then + echo "bad 'sacl_def_optacl' against 'sacl_def_optnoacl' output" + fi + + + echo "$sacl_def_optacl" > sacl_def_optacl.log + echo "$nosacl_def_optnoacl" > nosacl_def_optnoacl.log + if test ! "$sacl_def_optacl" "!=" "$nosacl_def_optnoacl"; then + echo "bad 'sacl_def_optacl' against 'nosacl_def_optnoacl' output" + fi + + + echo "$nosacl_def_optnoacl" > nosacl_def_optnoacl.log + echo "$nosacl_nodef_optnoacl" > nosacl_nodef_optnoacl.log + if test ! "$nosacl_def_optnoacl" "!=" "$nosacl_nodef_optnoacl"; then + echo "bad 'nosacl_def_optnoacl' against 'nosacl_nodef_optnoacl' output" + fi -diff before after -echo separator ) ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: -echo >>"$at_stdout"; $as_echo "separator -" | \ - $at_diff - "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/selacl01.at:28" +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/acls03.at:47" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/selacl01.at:28: -mkdir oldgnu -(cd oldgnu -TEST_TAR_FORMAT=oldgnu +$as_echo "$at_srcdir/acls03.at:47: +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu export TEST_TAR_FORMAT -TAR_OPTIONS=\"-H oldgnu\" +TAR_OPTIONS=\"-H gnu\" export TAR_OPTIONS rm -rf * -echo \"test\" > \$\$ -chmod 0 \$\$ -cat \$\$ > /dev/null 2>&1 -result=\$? -rm -f \$\$ -test \$result -eq 0 || exit 77 - - file=\$(TMPDIR=. mktemp fiXXXXXX) setfattr -n user.test -v test \$file &> /dev/null @@ -40803,13 +41685,13 @@ test \$result -eq 0 || exit 77 file=\$(TMPDIR=. mktemp fiXXXXXX) - restorecon \$file &> /dev/null + setfacl -m u:\$UID:rwx \$file &> /dev/null if test \"\$?\" != 0; then exit 77 fi - chcon -h --user=unconfined_u \$file &> /dev/null + getfacl \$file &> /dev/null if test \"\$?\" != 0; then exit 77 fi @@ -40817,83 +41699,192 @@ test \$result -eq 0 || exit 77 rm -rf \$file file=\$(TMPDIR=. mktemp fiXXXXXX) - err=\$( tar --selinux -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) + setfacl -m u:\$UID:rwx \$file + err=\$( tar --acls -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) if test \"\$err\" != \"0\"; then exit 77 fi +test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 - file=\$(TMPDIR=. mktemp fiXXXXXX) - setfacl -m u:\$UID:rwx \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi +MYNAME=\$( id -un ) +MYGROUP=\$( id -gn ) +# Prepare directory structure with default ACLs +mkdir -p pure/d1/d2 +genfile --file pure/d1/f2a +genfile --file pure/d1/f2b +genfile --file pure/d1/d2/f3a +genfile --file pure/d1/d2/f3b +setfacl -m g:\$MYGROUP:r-x pure/d1 +setfacl -d -m g:\$MYGROUP:rwx pure/d1 +setfacl -d -m u:\$MYNAME:rwx pure/d1 +# \"*a\" files have \"some\" additional ACLs +setfacl -m u:\$MYNAME:--- pure/d1/d2/f3a +setfacl -m u:\$MYNAME:--- pure/d1/f2a - getfacl \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi +# use default format (no acls stored) +tar -cf noacl.tar -C pure d1 - rm -rf \$file +# use posix format, acls stored +tar --acls -cf acl.tar -C pure d1 - file=\$(TMPDIR=. mktemp fiXXXXXX) - setfacl -m u:\$UID:rwx \$file - err=\$( tar --acls -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) - if test \"\$err\" != \"0\"; then - exit 77 - fi +# Directory names are chosen based on \"how the files were extracted from +# archive\". Equivalent no* tags are used also: +# ^sacl_ — extracted archive has stored ACLs +# _def_ — target directory (-C) has default ACLs +# _optacl\$ — extraction was done with --acls option +mkdir sacl_def_optacl +mkdir sacl_def_optnoacl +mkdir sacl_nodef_optacl +mkdir sacl_nodef_optnoacl +mkdir nosacl_def_optacl +mkdir nosacl_def_optnoacl +mkdir nosacl_nodef_optacl +mkdir nosacl_nodef_optnoacl -mkdir dir -mkfifo dir/fifo -MAJOR=\$( stat /dev/urandom --printf=\"%t\" ) -MINOR=\$( stat /dev/urandom --printf=\"%T\" ) -mknod dir/chartype c \$MAJOR \$MINOR +setfacl -d -m u:\$MYNAME:--- nosacl_def_optnoacl sacl_def_optnoacl sacl_def_optacl nosacl_def_optacl +setfacl -d -m g:\$MYGROUP:--- nosacl_def_optnoacl sacl_def_optnoacl sacl_def_optacl nosacl_def_optacl -# setup attributes -restorecon -R dir -chcon -h --user=system_u dir/fifo -chcon -h --user=system_u dir/chartype -setfacl -m u:\$UID:--- dir/fifo -setfacl -m u:\$UID:rwx dir/chartype +tar -xf acl.tar -C sacl_nodef_optnoacl +tar --acls -xf acl.tar -C sacl_nodef_optacl +tar -xf acl.tar -C sacl_def_optnoacl +tar --acls -xf acl.tar -C sacl_def_optacl +tar -xf noacl.tar -C nosacl_def_optnoacl +# _NO_ ACLs in output +tar -xf noacl.tar -C nosacl_nodef_optnoacl +tar -xf noacl.tar -C nosacl_nodef_optacl +tar -cf noacl_repackaged.tar -C nosacl_nodef_optnoacl d1 +# _NO_ ACLs in output (even when default ACLs exist) +tar --acls -xf noacl_repackaged.tar -C nosacl_def_optacl -getfacl dir/fifo >> before -getfattr -msecurity.selinux dir/chartype >> before -tar --xattrs --selinux --acls -cf archive.tar dir + cd pure + pure=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. -mv dir olddir -tar --xattrs --selinux --acls -xf archive.tar -getfacl dir/fifo >> after -getfattr -msecurity.selinux dir/chartype >> after + cd sacl_def_optacl + sacl_def_optacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. + + + cd sacl_def_optnoacl + sacl_def_optnoacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. + + + cd sacl_nodef_optacl + sacl_nodef_optacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. + + + cd sacl_nodef_optnoacl + sacl_nodef_optnoacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. + + + cd nosacl_def_optacl + nosacl_def_optacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. + + + cd nosacl_def_optnoacl + nosacl_def_optnoacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. + + + cd nosacl_nodef_optacl + nosacl_nodef_optacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. + + + cd nosacl_nodef_optnoacl + nosacl_nodef_optnoacl=\"\$(find d1 | sort | xargs -n 1 getfacl)\" + cd .. + + + + echo \"\$pure\" > pure.log + echo \"\$sacl_def_optacl\" > sacl_def_optacl.log + if test ! \"\$pure\" \"=\" \"\$sacl_def_optacl\"; then + echo \"bad 'pure' against 'sacl_def_optacl' output\" + fi + + + + echo \"\$sacl_def_optacl\" > sacl_def_optacl.log + echo \"\$sacl_nodef_optacl\" > sacl_nodef_optacl.log + if test ! \"\$sacl_def_optacl\" \"=\" \"\$sacl_nodef_optacl\"; then + echo \"bad 'sacl_def_optacl' against 'sacl_nodef_optacl' output\" + fi + + + echo \"\$sacl_def_optnoacl\" > sacl_def_optnoacl.log + echo \"\$nosacl_def_optnoacl\" > nosacl_def_optnoacl.log + if test ! \"\$sacl_def_optnoacl\" \"=\" \"\$nosacl_def_optnoacl\"; then + echo \"bad 'sacl_def_optnoacl' against 'nosacl_def_optnoacl' output\" + fi + + + echo \"\$sacl_nodef_optnoacl\" > sacl_nodef_optnoacl.log + echo \"\$nosacl_nodef_optnoacl\" > nosacl_nodef_optnoacl.log + if test ! \"\$sacl_nodef_optnoacl\" \"=\" \"\$nosacl_nodef_optnoacl\"; then + echo \"bad 'sacl_nodef_optnoacl' against 'nosacl_nodef_optnoacl' output\" + fi + + + echo \"\$nosacl_def_optacl\" > nosacl_def_optacl.log + echo \"\$nosacl_nodef_optacl\" > nosacl_nodef_optacl.log + if test ! \"\$nosacl_def_optacl\" \"=\" \"\$nosacl_nodef_optacl\"; then + echo \"bad 'nosacl_def_optacl' against 'nosacl_nodef_optacl' output\" + fi + + + echo \"\$nosacl_def_optacl\" > nosacl_def_optacl.log + echo \"\$nosacl_nodef_optnoacl\" > nosacl_nodef_optnoacl.log + if test ! \"\$nosacl_def_optacl\" \"=\" \"\$nosacl_nodef_optnoacl\"; then + echo \"bad 'nosacl_def_optacl' against 'nosacl_nodef_optnoacl' output\" + fi + + + + echo \"\$sacl_def_optacl\" > sacl_def_optacl.log + echo \"\$sacl_def_optnoacl\" > sacl_def_optnoacl.log + if test ! \"\$sacl_def_optacl\" \"!=\" \"\$sacl_def_optnoacl\"; then + echo \"bad 'sacl_def_optacl' against 'sacl_def_optnoacl' output\" + fi + + + echo \"\$sacl_def_optacl\" > sacl_def_optacl.log + echo \"\$nosacl_def_optnoacl\" > nosacl_def_optnoacl.log + if test ! \"\$sacl_def_optacl\" \"!=\" \"\$nosacl_def_optnoacl\"; then + echo \"bad 'sacl_def_optacl' against 'nosacl_def_optnoacl' output\" + fi + + + echo \"\$nosacl_def_optnoacl\" > nosacl_def_optnoacl.log + echo \"\$nosacl_nodef_optnoacl\" > nosacl_nodef_optnoacl.log + if test ! \"\$nosacl_def_optnoacl\" \"!=\" \"\$nosacl_nodef_optnoacl\"; then + echo \"bad 'nosacl_def_optnoacl' against 'nosacl_nodef_optnoacl' output\" + fi -diff before after -echo separator )" -at_fn_check_prepare_notrace 'a $(...) command substitution' "selacl01.at:28" +at_fn_check_prepare_notrace 'a `...` command substitution' "acls03.at:47" ( $at_check_trace; -mkdir oldgnu -(cd oldgnu -TEST_TAR_FORMAT=oldgnu +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu export TEST_TAR_FORMAT -TAR_OPTIONS="-H oldgnu" +TAR_OPTIONS="-H gnu" export TAR_OPTIONS rm -rf * -echo "test" > $$ -chmod 0 $$ -cat $$ > /dev/null 2>&1 -result=$? -rm -f $$ -test $result -eq 0 || exit 77 - - file=$(TMPDIR=. mktemp fiXXXXXX) setfattr -n user.test -v test $file &> /dev/null @@ -40912,13 +41903,13 @@ test $result -eq 0 || exit 77 file=$(TMPDIR=. mktemp fiXXXXXX) - restorecon $file &> /dev/null + setfacl -m u:$UID:rwx $file &> /dev/null if test "$?" != 0; then exit 77 fi - chcon -h --user=unconfined_u $file &> /dev/null + getfacl $file &> /dev/null if test "$?" != 0; then exit 77 fi @@ -40926,94 +41917,222 @@ test $result -eq 0 || exit 77 rm -rf $file file=$(TMPDIR=. mktemp fiXXXXXX) - err=$( tar --selinux -cf /dev/null $file 2>&1 >/dev/null | wc -l ) + setfacl -m u:$UID:rwx $file + err=$( tar --acls -cf /dev/null $file 2>&1 >/dev/null | wc -l ) if test "$err" != "0"; then exit 77 fi +test -z "`sort < /dev/null 2>&1`" || exit 77 - file=$(TMPDIR=. mktemp fiXXXXXX) - setfacl -m u:$UID:rwx $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi +MYNAME=$( id -un ) +MYGROUP=$( id -gn ) +# Prepare directory structure with default ACLs +mkdir -p pure/d1/d2 +genfile --file pure/d1/f2a +genfile --file pure/d1/f2b +genfile --file pure/d1/d2/f3a +genfile --file pure/d1/d2/f3b +setfacl -m g:$MYGROUP:r-x pure/d1 +setfacl -d -m g:$MYGROUP:rwx pure/d1 +setfacl -d -m u:$MYNAME:rwx pure/d1 +# "*a" files have "some" additional ACLs +setfacl -m u:$MYNAME:--- pure/d1/d2/f3a +setfacl -m u:$MYNAME:--- pure/d1/f2a - getfacl $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi +# use default format (no acls stored) +tar -cf noacl.tar -C pure d1 - rm -rf $file +# use posix format, acls stored +tar --acls -cf acl.tar -C pure d1 - file=$(TMPDIR=. mktemp fiXXXXXX) - setfacl -m u:$UID:rwx $file - err=$( tar --acls -cf /dev/null $file 2>&1 >/dev/null | wc -l ) - if test "$err" != "0"; then - exit 77 - fi +# Directory names are chosen based on "how the files were extracted from +# archive". Equivalent no* tags are used also: +# ^sacl_ — extracted archive has stored ACLs +# _def_ — target directory (-C) has default ACLs +# _optacl$ — extraction was done with --acls option +mkdir sacl_def_optacl +mkdir sacl_def_optnoacl +mkdir sacl_nodef_optacl +mkdir sacl_nodef_optnoacl +mkdir nosacl_def_optacl +mkdir nosacl_def_optnoacl +mkdir nosacl_nodef_optacl +mkdir nosacl_nodef_optnoacl -mkdir dir -mkfifo dir/fifo -MAJOR=$( stat /dev/urandom --printf="%t" ) -MINOR=$( stat /dev/urandom --printf="%T" ) -mknod dir/chartype c $MAJOR $MINOR +setfacl -d -m u:$MYNAME:--- nosacl_def_optnoacl sacl_def_optnoacl sacl_def_optacl nosacl_def_optacl +setfacl -d -m g:$MYGROUP:--- nosacl_def_optnoacl sacl_def_optnoacl sacl_def_optacl nosacl_def_optacl -# setup attributes -restorecon -R dir -chcon -h --user=system_u dir/fifo -chcon -h --user=system_u dir/chartype -setfacl -m u:$UID:--- dir/fifo -setfacl -m u:$UID:rwx dir/chartype +tar -xf acl.tar -C sacl_nodef_optnoacl +tar --acls -xf acl.tar -C sacl_nodef_optacl +tar -xf acl.tar -C sacl_def_optnoacl +tar --acls -xf acl.tar -C sacl_def_optacl +tar -xf noacl.tar -C nosacl_def_optnoacl +# _NO_ ACLs in output +tar -xf noacl.tar -C nosacl_nodef_optnoacl +tar -xf noacl.tar -C nosacl_nodef_optacl +tar -cf noacl_repackaged.tar -C nosacl_nodef_optnoacl d1 +# _NO_ ACLs in output (even when default ACLs exist) +tar --acls -xf noacl_repackaged.tar -C nosacl_def_optacl -getfacl dir/fifo >> before -getfattr -msecurity.selinux dir/chartype >> before -tar --xattrs --selinux --acls -cf archive.tar dir + cd pure + pure="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. -mv dir olddir -tar --xattrs --selinux --acls -xf archive.tar -getfacl dir/fifo >> after -getfattr -msecurity.selinux dir/chartype >> after + cd sacl_def_optacl + sacl_def_optacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd sacl_def_optnoacl + sacl_def_optnoacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd sacl_nodef_optacl + sacl_nodef_optacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd sacl_nodef_optnoacl + sacl_nodef_optnoacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd nosacl_def_optacl + nosacl_def_optacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd nosacl_def_optnoacl + nosacl_def_optnoacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd nosacl_nodef_optacl + nosacl_nodef_optacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + cd nosacl_nodef_optnoacl + nosacl_nodef_optnoacl="$(find d1 | sort | xargs -n 1 getfacl)" + cd .. + + + + echo "$pure" > pure.log + echo "$sacl_def_optacl" > sacl_def_optacl.log + if test ! "$pure" "=" "$sacl_def_optacl"; then + echo "bad 'pure' against 'sacl_def_optacl' output" + fi + + + + echo "$sacl_def_optacl" > sacl_def_optacl.log + echo "$sacl_nodef_optacl" > sacl_nodef_optacl.log + if test ! "$sacl_def_optacl" "=" "$sacl_nodef_optacl"; then + echo "bad 'sacl_def_optacl' against 'sacl_nodef_optacl' output" + fi + + + echo "$sacl_def_optnoacl" > sacl_def_optnoacl.log + echo "$nosacl_def_optnoacl" > nosacl_def_optnoacl.log + if test ! "$sacl_def_optnoacl" "=" "$nosacl_def_optnoacl"; then + echo "bad 'sacl_def_optnoacl' against 'nosacl_def_optnoacl' output" + fi + + + echo "$sacl_nodef_optnoacl" > sacl_nodef_optnoacl.log + echo "$nosacl_nodef_optnoacl" > nosacl_nodef_optnoacl.log + if test ! "$sacl_nodef_optnoacl" "=" "$nosacl_nodef_optnoacl"; then + echo "bad 'sacl_nodef_optnoacl' against 'nosacl_nodef_optnoacl' output" + fi + + + echo "$nosacl_def_optacl" > nosacl_def_optacl.log + echo "$nosacl_nodef_optacl" > nosacl_nodef_optacl.log + if test ! "$nosacl_def_optacl" "=" "$nosacl_nodef_optacl"; then + echo "bad 'nosacl_def_optacl' against 'nosacl_nodef_optacl' output" + fi + + + echo "$nosacl_def_optacl" > nosacl_def_optacl.log + echo "$nosacl_nodef_optnoacl" > nosacl_nodef_optnoacl.log + if test ! "$nosacl_def_optacl" "=" "$nosacl_nodef_optnoacl"; then + echo "bad 'nosacl_def_optacl' against 'nosacl_nodef_optnoacl' output" + fi + + + + echo "$sacl_def_optacl" > sacl_def_optacl.log + echo "$sacl_def_optnoacl" > sacl_def_optnoacl.log + if test ! "$sacl_def_optacl" "!=" "$sacl_def_optnoacl"; then + echo "bad 'sacl_def_optacl' against 'sacl_def_optnoacl' output" + fi + + + echo "$sacl_def_optacl" > sacl_def_optacl.log + echo "$nosacl_def_optnoacl" > nosacl_def_optnoacl.log + if test ! "$sacl_def_optacl" "!=" "$nosacl_def_optnoacl"; then + echo "bad 'sacl_def_optacl' against 'nosacl_def_optnoacl' output" + fi + + + echo "$nosacl_def_optnoacl" > nosacl_def_optnoacl.log + echo "$nosacl_nodef_optnoacl" > nosacl_nodef_optnoacl.log + if test ! "$nosacl_def_optnoacl" "!=" "$nosacl_nodef_optnoacl"; then + echo "bad 'nosacl_def_optnoacl' against 'nosacl_nodef_optnoacl' output" + fi -diff before after -echo separator ) ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: -echo >>"$at_stdout"; $as_echo "separator -" | \ - $at_diff - "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/selacl01.at:28" +at_fn_diff_devnull "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/acls03.at:47" $at_failed && at_fn_log_failure $at_traceon; } - { set +x -$as_echo "$at_srcdir/selacl01.at:28: -mkdir ustar -(cd ustar -TEST_TAR_FORMAT=ustar + + + + set +x + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 7>&- | eval $at_tee_pipe +read at_status <"$at_status_file" +#AT_STOP_175 +#AT_START_176 +at_fn_group_banner 176 'selnx01.at:25' \ + "selinux: basic store/restore" " " 25 +at_xfail=no + test -f $XFAILFILE && at_xfail=yes +( + $as_echo "176. $at_setup_line: testing $at_desc ..." + $at_traceon + + + + + + { set +x +$as_echo "$at_srcdir/selnx01.at:28: +mkdir v7 +(cd v7 +TEST_TAR_FORMAT=v7 export TEST_TAR_FORMAT -TAR_OPTIONS=\"-H ustar\" +TAR_OPTIONS=\"-H v7\" export TAR_OPTIONS rm -rf * -echo \"test\" > \$\$ -chmod 0 \$\$ -cat \$\$ > /dev/null 2>&1 -result=\$? -rm -f \$\$ -test \$result -eq 0 || exit 77 - - file=\$(TMPDIR=. mktemp fiXXXXXX) setfattr -n user.test -v test \$file &> /dev/null @@ -41052,77 +42171,77 @@ test \$result -eq 0 || exit 77 fi +mkdir dir +genfile --file dir/file +ln -s file dir/link + +getfattr -h -d -msecurity.selinux dir dir/file dir/link > start + +restorecon -R dir +chcon -h --user=system_u dir +chcon -h --user=unconfined_u dir/file +chcon -h --user=system_u dir/link - file=\$(TMPDIR=. mktemp fiXXXXXX) +# archive whole directory including selinux contexts +tar --selinux -cf archive.tar dir - setfacl -m u:\$UID:rwx \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi +# clear the directory +rm -rf dir +# ================================================ +# check if selinux contexts are correctly restored - getfacl \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi +tar --selinux -xf archive.tar - rm -rf \$file +# archive for later debugging +cp archive.tar archive_origin.tar - file=\$(TMPDIR=. mktemp fiXXXXXX) - setfacl -m u:\$UID:rwx \$file - err=\$( tar --acls -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) - if test \"\$err\" != \"0\"; then - exit 77 - fi +# check if selinux contexts were restored +getfattr -h -d dir dir/file dir/link -msecurity.selinux | \\ + grep -v -e '^#' -e ^\$ | cut -d: -f1 +# =========================================================================== +# check if selinux contexts are not restored when --selinux option is missing -mkdir dir -mkfifo dir/fifo -MAJOR=\$( stat /dev/urandom --printf=\"%t\" ) -MINOR=\$( stat /dev/urandom --printf=\"%T\" ) -mknod dir/chartype c \$MAJOR \$MINOR +getfattr -h -d -msecurity.selinux dir dir/file dir/link > with_selinux +rm -rf dir +tar -xf archive.tar +getfattr -h -d -msecurity.selinux dir dir/file dir/link > without_selinux -# setup attributes -restorecon -R dir -chcon -h --user=system_u dir/fifo -chcon -h --user=system_u dir/chartype -setfacl -m u:\$UID:--- dir/fifo -setfacl -m u:\$UID:rwx dir/chartype +diff with_selinux without_selinux > diff_with_without +if test \"\$?\" -eq \"0\"; then + echo \"selinux contexts probably restored while --selinux is off\" +fi -getfacl dir/fifo >> before -getfattr -msecurity.selinux dir/chartype >> before +# ================================================================= +# check if selinux is not archived when --selinux option is missing -tar --xattrs --selinux --acls -cf archive.tar dir +tar -cf archive.tar dir -mv dir olddir +# clear the directory +rm -rf dir -tar --xattrs --selinux --acls -xf archive.tar +# restore (with --selinux) +tar --selinux -xf archive.tar dir -getfacl dir/fifo >> after -getfattr -msecurity.selinux dir/chartype >> after +getfattr -h -d -msecurity.selinux dir dir/file dir/link > final +diff start final > final_diff +if test \"\$?\" -ne \"0\"; then + echo \"bad result\" +fi -diff before after -echo separator )" -at_fn_check_prepare_notrace 'a $(...) command substitution' "selacl01.at:28" +at_fn_check_prepare_notrace 'a $(...) command substitution' "selnx01.at:28" ( $at_check_trace; -mkdir ustar -(cd ustar -TEST_TAR_FORMAT=ustar +mkdir v7 +(cd v7 +TEST_TAR_FORMAT=v7 export TEST_TAR_FORMAT -TAR_OPTIONS="-H ustar" +TAR_OPTIONS="-H v7" export TAR_OPTIONS rm -rf * -echo "test" > $$ -chmod 0 $$ -cat $$ > /dev/null 2>&1 -result=$? -rm -f $$ -test $result -eq 0 || exit 77 - - file=$(TMPDIR=. mktemp fiXXXXXX) setfattr -n user.test -v test $file &> /dev/null @@ -41161,88 +42280,90 @@ test $result -eq 0 || exit 77 fi +mkdir dir +genfile --file dir/file +ln -s file dir/link + +getfattr -h -d -msecurity.selinux dir dir/file dir/link > start - file=$(TMPDIR=. mktemp fiXXXXXX) +restorecon -R dir +chcon -h --user=system_u dir +chcon -h --user=unconfined_u dir/file +chcon -h --user=system_u dir/link - setfacl -m u:$UID:rwx $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi +# archive whole directory including selinux contexts +tar --selinux -cf archive.tar dir +# clear the directory +rm -rf dir - getfacl $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi +# ================================================ +# check if selinux contexts are correctly restored - rm -rf $file +tar --selinux -xf archive.tar - file=$(TMPDIR=. mktemp fiXXXXXX) - setfacl -m u:$UID:rwx $file - err=$( tar --acls -cf /dev/null $file 2>&1 >/dev/null | wc -l ) - if test "$err" != "0"; then - exit 77 - fi +# archive for later debugging +cp archive.tar archive_origin.tar +# check if selinux contexts were restored +getfattr -h -d dir dir/file dir/link -msecurity.selinux | \ + grep -v -e '^#' -e ^$ | cut -d: -f1 -mkdir dir -mkfifo dir/fifo -MAJOR=$( stat /dev/urandom --printf="%t" ) -MINOR=$( stat /dev/urandom --printf="%T" ) -mknod dir/chartype c $MAJOR $MINOR +# =========================================================================== +# check if selinux contexts are not restored when --selinux option is missing -# setup attributes -restorecon -R dir -chcon -h --user=system_u dir/fifo -chcon -h --user=system_u dir/chartype -setfacl -m u:$UID:--- dir/fifo -setfacl -m u:$UID:rwx dir/chartype +getfattr -h -d -msecurity.selinux dir dir/file dir/link > with_selinux +rm -rf dir +tar -xf archive.tar +getfattr -h -d -msecurity.selinux dir dir/file dir/link > without_selinux -getfacl dir/fifo >> before -getfattr -msecurity.selinux dir/chartype >> before +diff with_selinux without_selinux > diff_with_without +if test "$?" -eq "0"; then + echo "selinux contexts probably restored while --selinux is off" +fi -tar --xattrs --selinux --acls -cf archive.tar dir +# ================================================================= +# check if selinux is not archived when --selinux option is missing -mv dir olddir +tar -cf archive.tar dir -tar --xattrs --selinux --acls -xf archive.tar +# clear the directory +rm -rf dir -getfacl dir/fifo >> after -getfattr -msecurity.selinux dir/chartype >> after +# restore (with --selinux) +tar --selinux -xf archive.tar dir + +getfattr -h -d -msecurity.selinux dir dir/file dir/link > final +diff start final > final_diff +if test "$?" -ne "0"; then + echo "bad result" +fi -diff before after -echo separator ) ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: -echo >>"$at_stdout"; $as_echo "separator +echo >>"$at_stdout"; $as_echo "security.selinux=\"system_u +security.selinux=\"unconfined_u +security.selinux=\"system_u " | \ $at_diff - "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/selacl01.at:28" +at_fn_check_status 0 $at_status "$at_srcdir/selnx01.at:28" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/selacl01.at:28: -mkdir posix -(cd posix -TEST_TAR_FORMAT=posix +$as_echo "$at_srcdir/selnx01.at:28: +mkdir oldgnu +(cd oldgnu +TEST_TAR_FORMAT=oldgnu export TEST_TAR_FORMAT -TAR_OPTIONS=\"-H posix\" +TAR_OPTIONS=\"-H oldgnu\" export TAR_OPTIONS rm -rf * -echo \"test\" > \$\$ -chmod 0 \$\$ -cat \$\$ > /dev/null 2>&1 -result=\$? -rm -f \$\$ -test \$result -eq 0 || exit 77 - - file=\$(TMPDIR=. mktemp fiXXXXXX) setfattr -n user.test -v test \$file &> /dev/null @@ -41281,77 +42402,77 @@ test \$result -eq 0 || exit 77 fi +mkdir dir +genfile --file dir/file +ln -s file dir/link - file=\$(TMPDIR=. mktemp fiXXXXXX) +getfattr -h -d -msecurity.selinux dir dir/file dir/link > start - setfacl -m u:\$UID:rwx \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi +restorecon -R dir +chcon -h --user=system_u dir +chcon -h --user=unconfined_u dir/file +chcon -h --user=system_u dir/link +# archive whole directory including selinux contexts +tar --selinux -cf archive.tar dir - getfacl \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi +# clear the directory +rm -rf dir - rm -rf \$file +# ================================================ +# check if selinux contexts are correctly restored - file=\$(TMPDIR=. mktemp fiXXXXXX) - setfacl -m u:\$UID:rwx \$file - err=\$( tar --acls -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) - if test \"\$err\" != \"0\"; then - exit 77 - fi +tar --selinux -xf archive.tar +# archive for later debugging +cp archive.tar archive_origin.tar -mkdir dir -mkfifo dir/fifo -MAJOR=\$( stat /dev/urandom --printf=\"%t\" ) -MINOR=\$( stat /dev/urandom --printf=\"%T\" ) -mknod dir/chartype c \$MAJOR \$MINOR +# check if selinux contexts were restored +getfattr -h -d dir dir/file dir/link -msecurity.selinux | \\ + grep -v -e '^#' -e ^\$ | cut -d: -f1 -# setup attributes -restorecon -R dir -chcon -h --user=system_u dir/fifo -chcon -h --user=system_u dir/chartype -setfacl -m u:\$UID:--- dir/fifo -setfacl -m u:\$UID:rwx dir/chartype +# =========================================================================== +# check if selinux contexts are not restored when --selinux option is missing -getfacl dir/fifo >> before -getfattr -msecurity.selinux dir/chartype >> before +getfattr -h -d -msecurity.selinux dir dir/file dir/link > with_selinux +rm -rf dir +tar -xf archive.tar +getfattr -h -d -msecurity.selinux dir dir/file dir/link > without_selinux -tar --xattrs --selinux --acls -cf archive.tar dir +diff with_selinux without_selinux > diff_with_without +if test \"\$?\" -eq \"0\"; then + echo \"selinux contexts probably restored while --selinux is off\" +fi -mv dir olddir +# ================================================================= +# check if selinux is not archived when --selinux option is missing -tar --xattrs --selinux --acls -xf archive.tar +tar -cf archive.tar dir -getfacl dir/fifo >> after -getfattr -msecurity.selinux dir/chartype >> after +# clear the directory +rm -rf dir + +# restore (with --selinux) +tar --selinux -xf archive.tar dir + +getfattr -h -d -msecurity.selinux dir dir/file dir/link > final +diff start final > final_diff +if test \"\$?\" -ne \"0\"; then + echo \"bad result\" +fi -diff before after -echo separator )" -at_fn_check_prepare_notrace 'a $(...) command substitution' "selacl01.at:28" +at_fn_check_prepare_notrace 'a $(...) command substitution' "selnx01.at:28" ( $at_check_trace; -mkdir posix -(cd posix -TEST_TAR_FORMAT=posix +mkdir oldgnu +(cd oldgnu +TEST_TAR_FORMAT=oldgnu export TEST_TAR_FORMAT -TAR_OPTIONS="-H posix" +TAR_OPTIONS="-H oldgnu" export TAR_OPTIONS rm -rf * -echo "test" > $$ -chmod 0 $$ -cat $$ > /dev/null 2>&1 -result=$? -rm -f $$ -test $result -eq 0 || exit 77 - - file=$(TMPDIR=. mktemp fiXXXXXX) setfattr -n user.test -v test $file &> /dev/null @@ -41390,88 +42511,90 @@ test $result -eq 0 || exit 77 fi +mkdir dir +genfile --file dir/file +ln -s file dir/link - file=$(TMPDIR=. mktemp fiXXXXXX) +getfattr -h -d -msecurity.selinux dir dir/file dir/link > start - setfacl -m u:$UID:rwx $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi +restorecon -R dir +chcon -h --user=system_u dir +chcon -h --user=unconfined_u dir/file +chcon -h --user=system_u dir/link +# archive whole directory including selinux contexts +tar --selinux -cf archive.tar dir - getfacl $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi +# clear the directory +rm -rf dir - rm -rf $file +# ================================================ +# check if selinux contexts are correctly restored - file=$(TMPDIR=. mktemp fiXXXXXX) - setfacl -m u:$UID:rwx $file - err=$( tar --acls -cf /dev/null $file 2>&1 >/dev/null | wc -l ) - if test "$err" != "0"; then - exit 77 - fi +tar --selinux -xf archive.tar +# archive for later debugging +cp archive.tar archive_origin.tar -mkdir dir -mkfifo dir/fifo -MAJOR=$( stat /dev/urandom --printf="%t" ) -MINOR=$( stat /dev/urandom --printf="%T" ) -mknod dir/chartype c $MAJOR $MINOR +# check if selinux contexts were restored +getfattr -h -d dir dir/file dir/link -msecurity.selinux | \ + grep -v -e '^#' -e ^$ | cut -d: -f1 -# setup attributes -restorecon -R dir -chcon -h --user=system_u dir/fifo -chcon -h --user=system_u dir/chartype -setfacl -m u:$UID:--- dir/fifo -setfacl -m u:$UID:rwx dir/chartype +# =========================================================================== +# check if selinux contexts are not restored when --selinux option is missing -getfacl dir/fifo >> before -getfattr -msecurity.selinux dir/chartype >> before +getfattr -h -d -msecurity.selinux dir dir/file dir/link > with_selinux +rm -rf dir +tar -xf archive.tar +getfattr -h -d -msecurity.selinux dir dir/file dir/link > without_selinux -tar --xattrs --selinux --acls -cf archive.tar dir +diff with_selinux without_selinux > diff_with_without +if test "$?" -eq "0"; then + echo "selinux contexts probably restored while --selinux is off" +fi -mv dir olddir +# ================================================================= +# check if selinux is not archived when --selinux option is missing -tar --xattrs --selinux --acls -xf archive.tar +tar -cf archive.tar dir -getfacl dir/fifo >> after -getfattr -msecurity.selinux dir/chartype >> after +# clear the directory +rm -rf dir + +# restore (with --selinux) +tar --selinux -xf archive.tar dir + +getfattr -h -d -msecurity.selinux dir dir/file dir/link > final +diff start final > final_diff +if test "$?" -ne "0"; then + echo "bad result" +fi -diff before after -echo separator ) ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: -echo >>"$at_stdout"; $as_echo "separator +echo >>"$at_stdout"; $as_echo "security.selinux=\"system_u +security.selinux=\"unconfined_u +security.selinux=\"system_u " | \ $at_diff - "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/selacl01.at:28" +at_fn_check_status 0 $at_status "$at_srcdir/selnx01.at:28" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/selacl01.at:28: -mkdir gnu -(cd gnu -TEST_TAR_FORMAT=gnu +$as_echo "$at_srcdir/selnx01.at:28: +mkdir ustar +(cd ustar +TEST_TAR_FORMAT=ustar export TEST_TAR_FORMAT -TAR_OPTIONS=\"-H gnu\" +TAR_OPTIONS=\"-H ustar\" export TAR_OPTIONS rm -rf * -echo \"test\" > \$\$ -chmod 0 \$\$ -cat \$\$ > /dev/null 2>&1 -result=\$? -rm -f \$\$ -test \$result -eq 0 || exit 77 - - file=\$(TMPDIR=. mktemp fiXXXXXX) setfattr -n user.test -v test \$file &> /dev/null @@ -41510,77 +42633,77 @@ test \$result -eq 0 || exit 77 fi +mkdir dir +genfile --file dir/file +ln -s file dir/link - file=\$(TMPDIR=. mktemp fiXXXXXX) +getfattr -h -d -msecurity.selinux dir dir/file dir/link > start - setfacl -m u:\$UID:rwx \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi +restorecon -R dir +chcon -h --user=system_u dir +chcon -h --user=unconfined_u dir/file +chcon -h --user=system_u dir/link +# archive whole directory including selinux contexts +tar --selinux -cf archive.tar dir - getfacl \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi +# clear the directory +rm -rf dir - rm -rf \$file +# ================================================ +# check if selinux contexts are correctly restored - file=\$(TMPDIR=. mktemp fiXXXXXX) - setfacl -m u:\$UID:rwx \$file - err=\$( tar --acls -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) - if test \"\$err\" != \"0\"; then - exit 77 - fi +tar --selinux -xf archive.tar +# archive for later debugging +cp archive.tar archive_origin.tar -mkdir dir -mkfifo dir/fifo -MAJOR=\$( stat /dev/urandom --printf=\"%t\" ) -MINOR=\$( stat /dev/urandom --printf=\"%T\" ) -mknod dir/chartype c \$MAJOR \$MINOR +# check if selinux contexts were restored +getfattr -h -d dir dir/file dir/link -msecurity.selinux | \\ + grep -v -e '^#' -e ^\$ | cut -d: -f1 -# setup attributes -restorecon -R dir -chcon -h --user=system_u dir/fifo -chcon -h --user=system_u dir/chartype -setfacl -m u:\$UID:--- dir/fifo -setfacl -m u:\$UID:rwx dir/chartype +# =========================================================================== +# check if selinux contexts are not restored when --selinux option is missing -getfacl dir/fifo >> before -getfattr -msecurity.selinux dir/chartype >> before +getfattr -h -d -msecurity.selinux dir dir/file dir/link > with_selinux +rm -rf dir +tar -xf archive.tar +getfattr -h -d -msecurity.selinux dir dir/file dir/link > without_selinux -tar --xattrs --selinux --acls -cf archive.tar dir +diff with_selinux without_selinux > diff_with_without +if test \"\$?\" -eq \"0\"; then + echo \"selinux contexts probably restored while --selinux is off\" +fi -mv dir olddir +# ================================================================= +# check if selinux is not archived when --selinux option is missing -tar --xattrs --selinux --acls -xf archive.tar +tar -cf archive.tar dir -getfacl dir/fifo >> after -getfattr -msecurity.selinux dir/chartype >> after +# clear the directory +rm -rf dir + +# restore (with --selinux) +tar --selinux -xf archive.tar dir + +getfattr -h -d -msecurity.selinux dir dir/file dir/link > final +diff start final > final_diff +if test \"\$?\" -ne \"0\"; then + echo \"bad result\" +fi -diff before after -echo separator )" -at_fn_check_prepare_notrace 'a $(...) command substitution' "selacl01.at:28" +at_fn_check_prepare_notrace 'a $(...) command substitution' "selnx01.at:28" ( $at_check_trace; -mkdir gnu -(cd gnu -TEST_TAR_FORMAT=gnu +mkdir ustar +(cd ustar +TEST_TAR_FORMAT=ustar export TEST_TAR_FORMAT -TAR_OPTIONS="-H gnu" +TAR_OPTIONS="-H ustar" export TAR_OPTIONS rm -rf * -echo "test" > $$ -chmod 0 $$ -cat $$ > /dev/null 2>&1 -result=$? -rm -f $$ -test $result -eq 0 || exit 77 - - file=$(TMPDIR=. mktemp fiXXXXXX) setfattr -n user.test -v test $file &> /dev/null @@ -41619,110 +42742,90 @@ test $result -eq 0 || exit 77 fi +mkdir dir +genfile --file dir/file +ln -s file dir/link - file=$(TMPDIR=. mktemp fiXXXXXX) +getfattr -h -d -msecurity.selinux dir dir/file dir/link > start - setfacl -m u:$UID:rwx $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi +restorecon -R dir +chcon -h --user=system_u dir +chcon -h --user=unconfined_u dir/file +chcon -h --user=system_u dir/link +# archive whole directory including selinux contexts +tar --selinux -cf archive.tar dir - getfacl $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi +# clear the directory +rm -rf dir - rm -rf $file +# ================================================ +# check if selinux contexts are correctly restored - file=$(TMPDIR=. mktemp fiXXXXXX) - setfacl -m u:$UID:rwx $file - err=$( tar --acls -cf /dev/null $file 2>&1 >/dev/null | wc -l ) - if test "$err" != "0"; then - exit 77 - fi +tar --selinux -xf archive.tar +# archive for later debugging +cp archive.tar archive_origin.tar -mkdir dir -mkfifo dir/fifo -MAJOR=$( stat /dev/urandom --printf="%t" ) -MINOR=$( stat /dev/urandom --printf="%T" ) -mknod dir/chartype c $MAJOR $MINOR +# check if selinux contexts were restored +getfattr -h -d dir dir/file dir/link -msecurity.selinux | \ + grep -v -e '^#' -e ^$ | cut -d: -f1 -# setup attributes -restorecon -R dir -chcon -h --user=system_u dir/fifo -chcon -h --user=system_u dir/chartype -setfacl -m u:$UID:--- dir/fifo -setfacl -m u:$UID:rwx dir/chartype +# =========================================================================== +# check if selinux contexts are not restored when --selinux option is missing -getfacl dir/fifo >> before -getfattr -msecurity.selinux dir/chartype >> before +getfattr -h -d -msecurity.selinux dir dir/file dir/link > with_selinux +rm -rf dir +tar -xf archive.tar +getfattr -h -d -msecurity.selinux dir dir/file dir/link > without_selinux -tar --xattrs --selinux --acls -cf archive.tar dir +diff with_selinux without_selinux > diff_with_without +if test "$?" -eq "0"; then + echo "selinux contexts probably restored while --selinux is off" +fi -mv dir olddir +# ================================================================= +# check if selinux is not archived when --selinux option is missing -tar --xattrs --selinux --acls -xf archive.tar +tar -cf archive.tar dir -getfacl dir/fifo >> after -getfattr -msecurity.selinux dir/chartype >> after +# clear the directory +rm -rf dir + +# restore (with --selinux) +tar --selinux -xf archive.tar dir + +getfattr -h -d -msecurity.selinux dir dir/file dir/link > final +diff start final > final_diff +if test "$?" -ne "0"; then + echo "bad result" +fi -diff before after -echo separator ) ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: -echo >>"$at_stdout"; $as_echo "separator +echo >>"$at_stdout"; $as_echo "security.selinux=\"system_u +security.selinux=\"unconfined_u +security.selinux=\"system_u " | \ $at_diff - "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/selacl01.at:28" +at_fn_check_status 0 $at_status "$at_srcdir/selnx01.at:28" $at_failed && at_fn_log_failure $at_traceon; } - - - - set +x - $at_times_p && times >"$at_times_file" -) 5>&1 2>&1 7>&- | eval $at_tee_pipe -read at_status <"$at_status_file" -#AT_STOP_173 -#AT_START_174 -at_fn_group_banner 174 'capabs_raw01.at:25' \ - "capabilities: binary store/restore" " " 25 -at_xfail=no - test -f $XFAILFILE && at_xfail=yes -( - $as_echo "174. $at_setup_line: testing $at_desc ..." - $at_traceon - - - - - - { set +x -$as_echo "$at_srcdir/capabs_raw01.at:28: -mkdir v7 -(cd v7 -TEST_TAR_FORMAT=v7 + { set +x +$as_echo "$at_srcdir/selnx01.at:28: +mkdir posix +(cd posix +TEST_TAR_FORMAT=posix export TEST_TAR_FORMAT -TAR_OPTIONS=\"-H v7\" +TAR_OPTIONS=\"-H posix\" export TAR_OPTIONS rm -rf * -echo \"test\" > \$\$ -chmod 0 \$\$ -cat \$\$ > /dev/null 2>&1 -result=\$? -rm -f \$\$ -test \$result -eq 0 || exit 77 - - - file=\$(TMPDIR=. mktemp fiXXXXXX) setfattr -n user.test -v test \$file &> /dev/null @@ -41737,67 +42840,101 @@ test \$result -eq 0 || exit 77 fi - file=\$(TMPDIR=. mktemp fiXXXXXX) - setfattr -n user.test -v ahoj \$file - # check whether tar fails to store xattrs - err=\$( tar --xattrs -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) - if test \"\$err\" != \"0\"; then - exit 77 - fi file=\$(TMPDIR=. mktemp fiXXXXXX) - setcap \"= cap_chown=ei\" \$file &> /dev/null + restorecon \$file &> /dev/null if test \"\$?\" != 0; then exit 77 fi - getcap \$file &> /dev/null + chcon -h --user=unconfined_u \$file &> /dev/null if test \"\$?\" != 0; then exit 77 fi rm -rf \$file + file=\$(TMPDIR=. mktemp fiXXXXXX) + err=\$( tar --selinux -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) + if test \"\$err\" != \"0\"; then + exit 77 + fi + mkdir dir genfile --file dir/file +ln -s file dir/link -setcap \"= cap_chown=ei\" dir/file +getfattr -h -d -msecurity.selinux dir dir/file dir/link > start -# archive whole directory including binary xattrs -tar --xattrs -cf archive.tar dir +restorecon -R dir +chcon -h --user=system_u dir +chcon -h --user=unconfined_u dir/file +chcon -h --user=system_u dir/link + +# archive whole directory including selinux contexts +tar --selinux -cf archive.tar dir # clear the directory rm -rf dir -# restore _all_ xattrs (not just the user.* domain) -tar --xattrs --xattrs-include='*' -xf archive.tar +# ================================================ +# check if selinux contexts are correctly restored + +tar --selinux -xf archive.tar + +# archive for later debugging +cp archive.tar archive_origin.tar + +# check if selinux contexts were restored +getfattr -h -d dir dir/file dir/link -msecurity.selinux | \\ + grep -v -e '^#' -e ^\$ | cut -d: -f1 + +# =========================================================================== +# check if selinux contexts are not restored when --selinux option is missing + +getfattr -h -d -msecurity.selinux dir dir/file dir/link > with_selinux +rm -rf dir +tar -xf archive.tar +getfattr -h -d -msecurity.selinux dir dir/file dir/link > without_selinux + +diff with_selinux without_selinux > diff_with_without +if test \"\$?\" -eq \"0\"; then + echo \"selinux contexts probably restored while --selinux is off\" +fi + +# ================================================================= +# check if selinux is not archived when --selinux option is missing + +tar -cf archive.tar dir + +# clear the directory +rm -rf dir + +# restore (with --selinux) +tar --selinux -xf archive.tar dir + +getfattr -h -d -msecurity.selinux dir dir/file dir/link > final +diff start final > final_diff +if test \"\$?\" -ne \"0\"; then + echo \"bad result\" +fi -getcap dir/file )" -at_fn_check_prepare_notrace 'a $(...) command substitution' "capabs_raw01.at:28" +at_fn_check_prepare_notrace 'a $(...) command substitution' "selnx01.at:28" ( $at_check_trace; -mkdir v7 -(cd v7 -TEST_TAR_FORMAT=v7 +mkdir posix +(cd posix +TEST_TAR_FORMAT=posix export TEST_TAR_FORMAT -TAR_OPTIONS="-H v7" +TAR_OPTIONS="-H posix" export TAR_OPTIONS rm -rf * -echo "test" > $$ -chmod 0 $$ -cat $$ > /dev/null 2>&1 -result=$? -rm -f $$ -test $result -eq 0 || exit 77 - - - file=$(TMPDIR=. mktemp fiXXXXXX) setfattr -n user.test -v test $file &> /dev/null @@ -41812,78 +42949,114 @@ test $result -eq 0 || exit 77 fi - file=$(TMPDIR=. mktemp fiXXXXXX) - setfattr -n user.test -v ahoj $file - # check whether tar fails to store xattrs - err=$( tar --xattrs -cf /dev/null $file 2>&1 >/dev/null | wc -l ) - if test "$err" != "0"; then - exit 77 - fi file=$(TMPDIR=. mktemp fiXXXXXX) - setcap "= cap_chown=ei" $file &> /dev/null + restorecon $file &> /dev/null if test "$?" != 0; then exit 77 fi - getcap $file &> /dev/null + chcon -h --user=unconfined_u $file &> /dev/null if test "$?" != 0; then exit 77 fi rm -rf $file + file=$(TMPDIR=. mktemp fiXXXXXX) + err=$( tar --selinux -cf /dev/null $file 2>&1 >/dev/null | wc -l ) + if test "$err" != "0"; then + exit 77 + fi + mkdir dir genfile --file dir/file +ln -s file dir/link -setcap "= cap_chown=ei" dir/file +getfattr -h -d -msecurity.selinux dir dir/file dir/link > start -# archive whole directory including binary xattrs -tar --xattrs -cf archive.tar dir +restorecon -R dir +chcon -h --user=system_u dir +chcon -h --user=unconfined_u dir/file +chcon -h --user=system_u dir/link + +# archive whole directory including selinux contexts +tar --selinux -cf archive.tar dir # clear the directory rm -rf dir -# restore _all_ xattrs (not just the user.* domain) -tar --xattrs --xattrs-include='*' -xf archive.tar +# ================================================ +# check if selinux contexts are correctly restored + +tar --selinux -xf archive.tar + +# archive for later debugging +cp archive.tar archive_origin.tar + +# check if selinux contexts were restored +getfattr -h -d dir dir/file dir/link -msecurity.selinux | \ + grep -v -e '^#' -e ^$ | cut -d: -f1 + +# =========================================================================== +# check if selinux contexts are not restored when --selinux option is missing + +getfattr -h -d -msecurity.selinux dir dir/file dir/link > with_selinux +rm -rf dir +tar -xf archive.tar +getfattr -h -d -msecurity.selinux dir dir/file dir/link > without_selinux + +diff with_selinux without_selinux > diff_with_without +if test "$?" -eq "0"; then + echo "selinux contexts probably restored while --selinux is off" +fi + +# ================================================================= +# check if selinux is not archived when --selinux option is missing + +tar -cf archive.tar dir + +# clear the directory +rm -rf dir + +# restore (with --selinux) +tar --selinux -xf archive.tar dir + +getfattr -h -d -msecurity.selinux dir dir/file dir/link > final +diff start final > final_diff +if test "$?" -ne "0"; then + echo "bad result" +fi -getcap dir/file ) ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: -echo >>"$at_stdout"; $as_echo "dir/file = cap_chown+ei +echo >>"$at_stdout"; $as_echo "security.selinux=\"system_u +security.selinux=\"unconfined_u +security.selinux=\"system_u " | \ $at_diff - "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/capabs_raw01.at:28" +at_fn_check_status 0 $at_status "$at_srcdir/selnx01.at:28" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/capabs_raw01.at:28: -mkdir oldgnu -(cd oldgnu -TEST_TAR_FORMAT=oldgnu +$as_echo "$at_srcdir/selnx01.at:28: +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu export TEST_TAR_FORMAT -TAR_OPTIONS=\"-H oldgnu\" +TAR_OPTIONS=\"-H gnu\" export TAR_OPTIONS rm -rf * -echo \"test\" > \$\$ -chmod 0 \$\$ -cat \$\$ > /dev/null 2>&1 -result=\$? -rm -f \$\$ -test \$result -eq 0 || exit 77 - - - file=\$(TMPDIR=. mktemp fiXXXXXX) setfattr -n user.test -v test \$file &> /dev/null @@ -41898,48 +43071,3244 @@ test \$result -eq 0 || exit 77 fi - file=\$(TMPDIR=. mktemp fiXXXXXX) - setfattr -n user.test -v ahoj \$file - # check whether tar fails to store xattrs - err=\$( tar --xattrs -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) - if test \"\$err\" != \"0\"; then - exit 77 - fi file=\$(TMPDIR=. mktemp fiXXXXXX) - setcap \"= cap_chown=ei\" \$file &> /dev/null + restorecon \$file &> /dev/null if test \"\$?\" != 0; then exit 77 fi - getcap \$file &> /dev/null + chcon -h --user=unconfined_u \$file &> /dev/null if test \"\$?\" != 0; then exit 77 fi rm -rf \$file + file=\$(TMPDIR=. mktemp fiXXXXXX) + err=\$( tar --selinux -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) + if test \"\$err\" != \"0\"; then + exit 77 + fi + mkdir dir genfile --file dir/file +ln -s file dir/link -setcap \"= cap_chown=ei\" dir/file +getfattr -h -d -msecurity.selinux dir dir/file dir/link > start -# archive whole directory including binary xattrs -tar --xattrs -cf archive.tar dir +restorecon -R dir +chcon -h --user=system_u dir +chcon -h --user=unconfined_u dir/file +chcon -h --user=system_u dir/link + +# archive whole directory including selinux contexts +tar --selinux -cf archive.tar dir + +# clear the directory +rm -rf dir + +# ================================================ +# check if selinux contexts are correctly restored + +tar --selinux -xf archive.tar + +# archive for later debugging +cp archive.tar archive_origin.tar + +# check if selinux contexts were restored +getfattr -h -d dir dir/file dir/link -msecurity.selinux | \\ + grep -v -e '^#' -e ^\$ | cut -d: -f1 + +# =========================================================================== +# check if selinux contexts are not restored when --selinux option is missing + +getfattr -h -d -msecurity.selinux dir dir/file dir/link > with_selinux +rm -rf dir +tar -xf archive.tar +getfattr -h -d -msecurity.selinux dir dir/file dir/link > without_selinux + +diff with_selinux without_selinux > diff_with_without +if test \"\$?\" -eq \"0\"; then + echo \"selinux contexts probably restored while --selinux is off\" +fi + +# ================================================================= +# check if selinux is not archived when --selinux option is missing + +tar -cf archive.tar dir + +# clear the directory +rm -rf dir + +# restore (with --selinux) +tar --selinux -xf archive.tar dir + +getfattr -h -d -msecurity.selinux dir dir/file dir/link > final +diff start final > final_diff +if test \"\$?\" -ne \"0\"; then + echo \"bad result\" +fi + +)" +at_fn_check_prepare_notrace 'a $(...) command substitution' "selnx01.at:28" +( $at_check_trace; +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS="-H gnu" +export TAR_OPTIONS +rm -rf * + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + setfattr -n user.test -v test $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + getfattr $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + restorecon $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + chcon -h --user=unconfined_u $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + rm -rf $file + + file=$(TMPDIR=. mktemp fiXXXXXX) + err=$( tar --selinux -cf /dev/null $file 2>&1 >/dev/null | wc -l ) + if test "$err" != "0"; then + exit 77 + fi + + +mkdir dir +genfile --file dir/file +ln -s file dir/link + +getfattr -h -d -msecurity.selinux dir dir/file dir/link > start + +restorecon -R dir +chcon -h --user=system_u dir +chcon -h --user=unconfined_u dir/file +chcon -h --user=system_u dir/link + +# archive whole directory including selinux contexts +tar --selinux -cf archive.tar dir + +# clear the directory +rm -rf dir + +# ================================================ +# check if selinux contexts are correctly restored + +tar --selinux -xf archive.tar + +# archive for later debugging +cp archive.tar archive_origin.tar + +# check if selinux contexts were restored +getfattr -h -d dir dir/file dir/link -msecurity.selinux | \ + grep -v -e '^#' -e ^$ | cut -d: -f1 + +# =========================================================================== +# check if selinux contexts are not restored when --selinux option is missing + +getfattr -h -d -msecurity.selinux dir dir/file dir/link > with_selinux +rm -rf dir +tar -xf archive.tar +getfattr -h -d -msecurity.selinux dir dir/file dir/link > without_selinux + +diff with_selinux without_selinux > diff_with_without +if test "$?" -eq "0"; then + echo "selinux contexts probably restored while --selinux is off" +fi + +# ================================================================= +# check if selinux is not archived when --selinux option is missing + +tar -cf archive.tar dir + +# clear the directory +rm -rf dir + +# restore (with --selinux) +tar --selinux -xf archive.tar dir + +getfattr -h -d -msecurity.selinux dir dir/file dir/link > final +diff start final > final_diff +if test "$?" -ne "0"; then + echo "bad result" +fi + +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "security.selinux=\"system_u +security.selinux=\"unconfined_u +security.selinux=\"system_u +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/selnx01.at:28" +$at_failed && at_fn_log_failure +$at_traceon; } + + + + + set +x + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 7>&- | eval $at_tee_pipe +read at_status <"$at_status_file" +#AT_STOP_176 +#AT_START_177 +at_fn_group_banner 177 'selacl01.at:25' \ + "acls/selinux: special files & fifos" " " 25 +at_xfail=no + test -f $XFAILFILE && at_xfail=yes +( + $as_echo "177. $at_setup_line: testing $at_desc ..." + $at_traceon + + + + + + { set +x +$as_echo "$at_srcdir/selacl01.at:28: +mkdir v7 +(cd v7 +TEST_TAR_FORMAT=v7 +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H v7\" +export TAR_OPTIONS +rm -rf * + + +echo \"test\" > \$\$ +chmod 0 \$\$ +cat \$\$ > /dev/null 2>&1 +result=\$? +rm -f \$\$ +test \$result -eq 0 || exit 77 + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + + setfattr -n user.test -v test \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + getfattr \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + + restorecon \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + chcon -h --user=unconfined_u \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + rm -rf \$file + + file=\$(TMPDIR=. mktemp fiXXXXXX) + err=\$( tar --selinux -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) + if test \"\$err\" != \"0\"; then + exit 77 + fi + + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + + setfacl -m u:\$UID:rwx \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + getfacl \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + rm -rf \$file + + file=\$(TMPDIR=. mktemp fiXXXXXX) + setfacl -m u:\$UID:rwx \$file + err=\$( tar --acls -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) + if test \"\$err\" != \"0\"; then + exit 77 + fi + + +mkdir dir +mkfifo dir/fifo +MAJOR=\$( stat /dev/urandom --printf=\"%t\" ) +MINOR=\$( stat /dev/urandom --printf=\"%T\" ) +mknod dir/chartype c \$MAJOR \$MINOR + +# setup attributes +restorecon -R dir +chcon -h --user=system_u dir/fifo +chcon -h --user=system_u dir/chartype +setfacl -m u:\$UID:--- dir/fifo +setfacl -m u:\$UID:rwx dir/chartype + +getfacl dir/fifo >> before +getfattr -msecurity.selinux dir/chartype >> before + +tar --xattrs --selinux --acls -cf archive.tar dir + +mv dir olddir + +tar --xattrs --selinux --acls -xf archive.tar + +getfacl dir/fifo >> after +getfattr -msecurity.selinux dir/chartype >> after + +diff before after +echo separator +)" +at_fn_check_prepare_notrace 'a $(...) command substitution' "selacl01.at:28" +( $at_check_trace; +mkdir v7 +(cd v7 +TEST_TAR_FORMAT=v7 +export TEST_TAR_FORMAT +TAR_OPTIONS="-H v7" +export TAR_OPTIONS +rm -rf * + + +echo "test" > $$ +chmod 0 $$ +cat $$ > /dev/null 2>&1 +result=$? +rm -f $$ +test $result -eq 0 || exit 77 + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + setfattr -n user.test -v test $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + getfattr $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + restorecon $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + chcon -h --user=unconfined_u $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + rm -rf $file + + file=$(TMPDIR=. mktemp fiXXXXXX) + err=$( tar --selinux -cf /dev/null $file 2>&1 >/dev/null | wc -l ) + if test "$err" != "0"; then + exit 77 + fi + + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + setfacl -m u:$UID:rwx $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + getfacl $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + rm -rf $file + + file=$(TMPDIR=. mktemp fiXXXXXX) + setfacl -m u:$UID:rwx $file + err=$( tar --acls -cf /dev/null $file 2>&1 >/dev/null | wc -l ) + if test "$err" != "0"; then + exit 77 + fi + + +mkdir dir +mkfifo dir/fifo +MAJOR=$( stat /dev/urandom --printf="%t" ) +MINOR=$( stat /dev/urandom --printf="%T" ) +mknod dir/chartype c $MAJOR $MINOR + +# setup attributes +restorecon -R dir +chcon -h --user=system_u dir/fifo +chcon -h --user=system_u dir/chartype +setfacl -m u:$UID:--- dir/fifo +setfacl -m u:$UID:rwx dir/chartype + +getfacl dir/fifo >> before +getfattr -msecurity.selinux dir/chartype >> before + +tar --xattrs --selinux --acls -cf archive.tar dir + +mv dir olddir + +tar --xattrs --selinux --acls -xf archive.tar + +getfacl dir/fifo >> after +getfattr -msecurity.selinux dir/chartype >> after + +diff before after +echo separator +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "separator +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/selacl01.at:28" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/selacl01.at:28: +mkdir oldgnu +(cd oldgnu +TEST_TAR_FORMAT=oldgnu +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H oldgnu\" +export TAR_OPTIONS +rm -rf * + + +echo \"test\" > \$\$ +chmod 0 \$\$ +cat \$\$ > /dev/null 2>&1 +result=\$? +rm -f \$\$ +test \$result -eq 0 || exit 77 + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + + setfattr -n user.test -v test \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + getfattr \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + + restorecon \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + chcon -h --user=unconfined_u \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + rm -rf \$file + + file=\$(TMPDIR=. mktemp fiXXXXXX) + err=\$( tar --selinux -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) + if test \"\$err\" != \"0\"; then + exit 77 + fi + + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + + setfacl -m u:\$UID:rwx \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + getfacl \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + rm -rf \$file + + file=\$(TMPDIR=. mktemp fiXXXXXX) + setfacl -m u:\$UID:rwx \$file + err=\$( tar --acls -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) + if test \"\$err\" != \"0\"; then + exit 77 + fi + + +mkdir dir +mkfifo dir/fifo +MAJOR=\$( stat /dev/urandom --printf=\"%t\" ) +MINOR=\$( stat /dev/urandom --printf=\"%T\" ) +mknod dir/chartype c \$MAJOR \$MINOR + +# setup attributes +restorecon -R dir +chcon -h --user=system_u dir/fifo +chcon -h --user=system_u dir/chartype +setfacl -m u:\$UID:--- dir/fifo +setfacl -m u:\$UID:rwx dir/chartype + +getfacl dir/fifo >> before +getfattr -msecurity.selinux dir/chartype >> before + +tar --xattrs --selinux --acls -cf archive.tar dir + +mv dir olddir + +tar --xattrs --selinux --acls -xf archive.tar + +getfacl dir/fifo >> after +getfattr -msecurity.selinux dir/chartype >> after + +diff before after +echo separator +)" +at_fn_check_prepare_notrace 'a $(...) command substitution' "selacl01.at:28" +( $at_check_trace; +mkdir oldgnu +(cd oldgnu +TEST_TAR_FORMAT=oldgnu +export TEST_TAR_FORMAT +TAR_OPTIONS="-H oldgnu" +export TAR_OPTIONS +rm -rf * + + +echo "test" > $$ +chmod 0 $$ +cat $$ > /dev/null 2>&1 +result=$? +rm -f $$ +test $result -eq 0 || exit 77 + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + setfattr -n user.test -v test $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + getfattr $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + restorecon $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + chcon -h --user=unconfined_u $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + rm -rf $file + + file=$(TMPDIR=. mktemp fiXXXXXX) + err=$( tar --selinux -cf /dev/null $file 2>&1 >/dev/null | wc -l ) + if test "$err" != "0"; then + exit 77 + fi + + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + setfacl -m u:$UID:rwx $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + getfacl $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + rm -rf $file + + file=$(TMPDIR=. mktemp fiXXXXXX) + setfacl -m u:$UID:rwx $file + err=$( tar --acls -cf /dev/null $file 2>&1 >/dev/null | wc -l ) + if test "$err" != "0"; then + exit 77 + fi + + +mkdir dir +mkfifo dir/fifo +MAJOR=$( stat /dev/urandom --printf="%t" ) +MINOR=$( stat /dev/urandom --printf="%T" ) +mknod dir/chartype c $MAJOR $MINOR + +# setup attributes +restorecon -R dir +chcon -h --user=system_u dir/fifo +chcon -h --user=system_u dir/chartype +setfacl -m u:$UID:--- dir/fifo +setfacl -m u:$UID:rwx dir/chartype + +getfacl dir/fifo >> before +getfattr -msecurity.selinux dir/chartype >> before + +tar --xattrs --selinux --acls -cf archive.tar dir + +mv dir olddir + +tar --xattrs --selinux --acls -xf archive.tar + +getfacl dir/fifo >> after +getfattr -msecurity.selinux dir/chartype >> after + +diff before after +echo separator +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "separator +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/selacl01.at:28" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/selacl01.at:28: +mkdir ustar +(cd ustar +TEST_TAR_FORMAT=ustar +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H ustar\" +export TAR_OPTIONS +rm -rf * + + +echo \"test\" > \$\$ +chmod 0 \$\$ +cat \$\$ > /dev/null 2>&1 +result=\$? +rm -f \$\$ +test \$result -eq 0 || exit 77 + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + + setfattr -n user.test -v test \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + getfattr \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + + restorecon \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + chcon -h --user=unconfined_u \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + rm -rf \$file + + file=\$(TMPDIR=. mktemp fiXXXXXX) + err=\$( tar --selinux -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) + if test \"\$err\" != \"0\"; then + exit 77 + fi + + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + + setfacl -m u:\$UID:rwx \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + getfacl \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + rm -rf \$file + + file=\$(TMPDIR=. mktemp fiXXXXXX) + setfacl -m u:\$UID:rwx \$file + err=\$( tar --acls -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) + if test \"\$err\" != \"0\"; then + exit 77 + fi + + +mkdir dir +mkfifo dir/fifo +MAJOR=\$( stat /dev/urandom --printf=\"%t\" ) +MINOR=\$( stat /dev/urandom --printf=\"%T\" ) +mknod dir/chartype c \$MAJOR \$MINOR + +# setup attributes +restorecon -R dir +chcon -h --user=system_u dir/fifo +chcon -h --user=system_u dir/chartype +setfacl -m u:\$UID:--- dir/fifo +setfacl -m u:\$UID:rwx dir/chartype + +getfacl dir/fifo >> before +getfattr -msecurity.selinux dir/chartype >> before + +tar --xattrs --selinux --acls -cf archive.tar dir + +mv dir olddir + +tar --xattrs --selinux --acls -xf archive.tar + +getfacl dir/fifo >> after +getfattr -msecurity.selinux dir/chartype >> after + +diff before after +echo separator +)" +at_fn_check_prepare_notrace 'a $(...) command substitution' "selacl01.at:28" +( $at_check_trace; +mkdir ustar +(cd ustar +TEST_TAR_FORMAT=ustar +export TEST_TAR_FORMAT +TAR_OPTIONS="-H ustar" +export TAR_OPTIONS +rm -rf * + + +echo "test" > $$ +chmod 0 $$ +cat $$ > /dev/null 2>&1 +result=$? +rm -f $$ +test $result -eq 0 || exit 77 + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + setfattr -n user.test -v test $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + getfattr $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + restorecon $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + chcon -h --user=unconfined_u $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + rm -rf $file + + file=$(TMPDIR=. mktemp fiXXXXXX) + err=$( tar --selinux -cf /dev/null $file 2>&1 >/dev/null | wc -l ) + if test "$err" != "0"; then + exit 77 + fi + + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + setfacl -m u:$UID:rwx $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + getfacl $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + rm -rf $file + + file=$(TMPDIR=. mktemp fiXXXXXX) + setfacl -m u:$UID:rwx $file + err=$( tar --acls -cf /dev/null $file 2>&1 >/dev/null | wc -l ) + if test "$err" != "0"; then + exit 77 + fi + + +mkdir dir +mkfifo dir/fifo +MAJOR=$( stat /dev/urandom --printf="%t" ) +MINOR=$( stat /dev/urandom --printf="%T" ) +mknod dir/chartype c $MAJOR $MINOR + +# setup attributes +restorecon -R dir +chcon -h --user=system_u dir/fifo +chcon -h --user=system_u dir/chartype +setfacl -m u:$UID:--- dir/fifo +setfacl -m u:$UID:rwx dir/chartype + +getfacl dir/fifo >> before +getfattr -msecurity.selinux dir/chartype >> before + +tar --xattrs --selinux --acls -cf archive.tar dir + +mv dir olddir + +tar --xattrs --selinux --acls -xf archive.tar + +getfacl dir/fifo >> after +getfattr -msecurity.selinux dir/chartype >> after + +diff before after +echo separator +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "separator +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/selacl01.at:28" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/selacl01.at:28: +mkdir posix +(cd posix +TEST_TAR_FORMAT=posix +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H posix\" +export TAR_OPTIONS +rm -rf * + + +echo \"test\" > \$\$ +chmod 0 \$\$ +cat \$\$ > /dev/null 2>&1 +result=\$? +rm -f \$\$ +test \$result -eq 0 || exit 77 + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + + setfattr -n user.test -v test \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + getfattr \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + + restorecon \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + chcon -h --user=unconfined_u \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + rm -rf \$file + + file=\$(TMPDIR=. mktemp fiXXXXXX) + err=\$( tar --selinux -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) + if test \"\$err\" != \"0\"; then + exit 77 + fi + + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + + setfacl -m u:\$UID:rwx \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + getfacl \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + rm -rf \$file + + file=\$(TMPDIR=. mktemp fiXXXXXX) + setfacl -m u:\$UID:rwx \$file + err=\$( tar --acls -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) + if test \"\$err\" != \"0\"; then + exit 77 + fi + + +mkdir dir +mkfifo dir/fifo +MAJOR=\$( stat /dev/urandom --printf=\"%t\" ) +MINOR=\$( stat /dev/urandom --printf=\"%T\" ) +mknod dir/chartype c \$MAJOR \$MINOR + +# setup attributes +restorecon -R dir +chcon -h --user=system_u dir/fifo +chcon -h --user=system_u dir/chartype +setfacl -m u:\$UID:--- dir/fifo +setfacl -m u:\$UID:rwx dir/chartype + +getfacl dir/fifo >> before +getfattr -msecurity.selinux dir/chartype >> before + +tar --xattrs --selinux --acls -cf archive.tar dir + +mv dir olddir + +tar --xattrs --selinux --acls -xf archive.tar + +getfacl dir/fifo >> after +getfattr -msecurity.selinux dir/chartype >> after + +diff before after +echo separator +)" +at_fn_check_prepare_notrace 'a $(...) command substitution' "selacl01.at:28" +( $at_check_trace; +mkdir posix +(cd posix +TEST_TAR_FORMAT=posix +export TEST_TAR_FORMAT +TAR_OPTIONS="-H posix" +export TAR_OPTIONS +rm -rf * + + +echo "test" > $$ +chmod 0 $$ +cat $$ > /dev/null 2>&1 +result=$? +rm -f $$ +test $result -eq 0 || exit 77 + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + setfattr -n user.test -v test $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + getfattr $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + restorecon $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + chcon -h --user=unconfined_u $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + rm -rf $file + + file=$(TMPDIR=. mktemp fiXXXXXX) + err=$( tar --selinux -cf /dev/null $file 2>&1 >/dev/null | wc -l ) + if test "$err" != "0"; then + exit 77 + fi + + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + setfacl -m u:$UID:rwx $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + getfacl $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + rm -rf $file + + file=$(TMPDIR=. mktemp fiXXXXXX) + setfacl -m u:$UID:rwx $file + err=$( tar --acls -cf /dev/null $file 2>&1 >/dev/null | wc -l ) + if test "$err" != "0"; then + exit 77 + fi + + +mkdir dir +mkfifo dir/fifo +MAJOR=$( stat /dev/urandom --printf="%t" ) +MINOR=$( stat /dev/urandom --printf="%T" ) +mknod dir/chartype c $MAJOR $MINOR + +# setup attributes +restorecon -R dir +chcon -h --user=system_u dir/fifo +chcon -h --user=system_u dir/chartype +setfacl -m u:$UID:--- dir/fifo +setfacl -m u:$UID:rwx dir/chartype + +getfacl dir/fifo >> before +getfattr -msecurity.selinux dir/chartype >> before + +tar --xattrs --selinux --acls -cf archive.tar dir + +mv dir olddir + +tar --xattrs --selinux --acls -xf archive.tar + +getfacl dir/fifo >> after +getfattr -msecurity.selinux dir/chartype >> after + +diff before after +echo separator +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "separator +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/selacl01.at:28" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/selacl01.at:28: +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H gnu\" +export TAR_OPTIONS +rm -rf * + + +echo \"test\" > \$\$ +chmod 0 \$\$ +cat \$\$ > /dev/null 2>&1 +result=\$? +rm -f \$\$ +test \$result -eq 0 || exit 77 + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + + setfattr -n user.test -v test \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + getfattr \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + + restorecon \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + chcon -h --user=unconfined_u \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + rm -rf \$file + + file=\$(TMPDIR=. mktemp fiXXXXXX) + err=\$( tar --selinux -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) + if test \"\$err\" != \"0\"; then + exit 77 + fi + + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + + setfacl -m u:\$UID:rwx \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + getfacl \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + rm -rf \$file + + file=\$(TMPDIR=. mktemp fiXXXXXX) + setfacl -m u:\$UID:rwx \$file + err=\$( tar --acls -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) + if test \"\$err\" != \"0\"; then + exit 77 + fi + + +mkdir dir +mkfifo dir/fifo +MAJOR=\$( stat /dev/urandom --printf=\"%t\" ) +MINOR=\$( stat /dev/urandom --printf=\"%T\" ) +mknod dir/chartype c \$MAJOR \$MINOR + +# setup attributes +restorecon -R dir +chcon -h --user=system_u dir/fifo +chcon -h --user=system_u dir/chartype +setfacl -m u:\$UID:--- dir/fifo +setfacl -m u:\$UID:rwx dir/chartype + +getfacl dir/fifo >> before +getfattr -msecurity.selinux dir/chartype >> before + +tar --xattrs --selinux --acls -cf archive.tar dir + +mv dir olddir + +tar --xattrs --selinux --acls -xf archive.tar + +getfacl dir/fifo >> after +getfattr -msecurity.selinux dir/chartype >> after + +diff before after +echo separator +)" +at_fn_check_prepare_notrace 'a $(...) command substitution' "selacl01.at:28" +( $at_check_trace; +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS="-H gnu" +export TAR_OPTIONS +rm -rf * + + +echo "test" > $$ +chmod 0 $$ +cat $$ > /dev/null 2>&1 +result=$? +rm -f $$ +test $result -eq 0 || exit 77 + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + setfattr -n user.test -v test $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + getfattr $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + restorecon $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + chcon -h --user=unconfined_u $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + rm -rf $file + + file=$(TMPDIR=. mktemp fiXXXXXX) + err=$( tar --selinux -cf /dev/null $file 2>&1 >/dev/null | wc -l ) + if test "$err" != "0"; then + exit 77 + fi + + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + setfacl -m u:$UID:rwx $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + getfacl $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + rm -rf $file + + file=$(TMPDIR=. mktemp fiXXXXXX) + setfacl -m u:$UID:rwx $file + err=$( tar --acls -cf /dev/null $file 2>&1 >/dev/null | wc -l ) + if test "$err" != "0"; then + exit 77 + fi + + +mkdir dir +mkfifo dir/fifo +MAJOR=$( stat /dev/urandom --printf="%t" ) +MINOR=$( stat /dev/urandom --printf="%T" ) +mknod dir/chartype c $MAJOR $MINOR + +# setup attributes +restorecon -R dir +chcon -h --user=system_u dir/fifo +chcon -h --user=system_u dir/chartype +setfacl -m u:$UID:--- dir/fifo +setfacl -m u:$UID:rwx dir/chartype + +getfacl dir/fifo >> before +getfattr -msecurity.selinux dir/chartype >> before + +tar --xattrs --selinux --acls -cf archive.tar dir + +mv dir olddir + +tar --xattrs --selinux --acls -xf archive.tar + +getfacl dir/fifo >> after +getfattr -msecurity.selinux dir/chartype >> after + +diff before after +echo separator +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "separator +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/selacl01.at:28" +$at_failed && at_fn_log_failure +$at_traceon; } + + + + + set +x + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 7>&- | eval $at_tee_pipe +read at_status <"$at_status_file" +#AT_STOP_177 +#AT_START_178 +at_fn_group_banner 178 'capabs_raw01.at:25' \ + "capabilities: binary store/restore" " " 25 +at_xfail=no + test -f $XFAILFILE && at_xfail=yes +( + $as_echo "178. $at_setup_line: testing $at_desc ..." + $at_traceon + + + + + + { set +x +$as_echo "$at_srcdir/capabs_raw01.at:28: +mkdir v7 +(cd v7 +TEST_TAR_FORMAT=v7 +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H v7\" +export TAR_OPTIONS +rm -rf * + + +echo \"test\" > \$\$ +chmod 0 \$\$ +cat \$\$ > /dev/null 2>&1 +result=\$? +rm -f \$\$ +test \$result -eq 0 || exit 77 + + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + + setfattr -n user.test -v test \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + getfattr \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + setfattr -n user.test -v ahoj \$file + # check whether tar fails to store xattrs + err=\$( tar --xattrs -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) + if test \"\$err\" != \"0\"; then + exit 77 + fi + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + + setcap \"= cap_chown=ei\" \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + getcap \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + rm -rf \$file + + +mkdir dir +genfile --file dir/file + +setcap \"= cap_chown=ei\" dir/file + +# archive whole directory including binary xattrs +tar --xattrs -cf archive.tar dir + +# clear the directory +rm -rf dir + +# restore _all_ xattrs (not just the user.* domain) +tar --xattrs --xattrs-include='*' -xf archive.tar + +getcap dir/file +)" +at_fn_check_prepare_notrace 'a $(...) command substitution' "capabs_raw01.at:28" +( $at_check_trace; +mkdir v7 +(cd v7 +TEST_TAR_FORMAT=v7 +export TEST_TAR_FORMAT +TAR_OPTIONS="-H v7" +export TAR_OPTIONS +rm -rf * + + +echo "test" > $$ +chmod 0 $$ +cat $$ > /dev/null 2>&1 +result=$? +rm -f $$ +test $result -eq 0 || exit 77 + + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + setfattr -n user.test -v test $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + getfattr $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + file=$(TMPDIR=. mktemp fiXXXXXX) + setfattr -n user.test -v ahoj $file + # check whether tar fails to store xattrs + err=$( tar --xattrs -cf /dev/null $file 2>&1 >/dev/null | wc -l ) + if test "$err" != "0"; then + exit 77 + fi + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + setcap "= cap_chown=ei" $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + getcap $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + rm -rf $file + + +mkdir dir +genfile --file dir/file + +setcap "= cap_chown=ei" dir/file + +# archive whole directory including binary xattrs +tar --xattrs -cf archive.tar dir + +# clear the directory +rm -rf dir + +# restore _all_ xattrs (not just the user.* domain) +tar --xattrs --xattrs-include='*' -xf archive.tar + +getcap dir/file +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "dir/file = cap_chown+ei +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/capabs_raw01.at:28" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/capabs_raw01.at:28: +mkdir oldgnu +(cd oldgnu +TEST_TAR_FORMAT=oldgnu +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H oldgnu\" +export TAR_OPTIONS +rm -rf * + + +echo \"test\" > \$\$ +chmod 0 \$\$ +cat \$\$ > /dev/null 2>&1 +result=\$? +rm -f \$\$ +test \$result -eq 0 || exit 77 + + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + + setfattr -n user.test -v test \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + getfattr \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + setfattr -n user.test -v ahoj \$file + # check whether tar fails to store xattrs + err=\$( tar --xattrs -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) + if test \"\$err\" != \"0\"; then + exit 77 + fi + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + + setcap \"= cap_chown=ei\" \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + getcap \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + rm -rf \$file + + +mkdir dir +genfile --file dir/file + +setcap \"= cap_chown=ei\" dir/file + +# archive whole directory including binary xattrs +tar --xattrs -cf archive.tar dir + +# clear the directory +rm -rf dir + +# restore _all_ xattrs (not just the user.* domain) +tar --xattrs --xattrs-include='*' -xf archive.tar + +getcap dir/file +)" +at_fn_check_prepare_notrace 'a $(...) command substitution' "capabs_raw01.at:28" +( $at_check_trace; +mkdir oldgnu +(cd oldgnu +TEST_TAR_FORMAT=oldgnu +export TEST_TAR_FORMAT +TAR_OPTIONS="-H oldgnu" +export TAR_OPTIONS +rm -rf * + + +echo "test" > $$ +chmod 0 $$ +cat $$ > /dev/null 2>&1 +result=$? +rm -f $$ +test $result -eq 0 || exit 77 + + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + setfattr -n user.test -v test $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + getfattr $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + file=$(TMPDIR=. mktemp fiXXXXXX) + setfattr -n user.test -v ahoj $file + # check whether tar fails to store xattrs + err=$( tar --xattrs -cf /dev/null $file 2>&1 >/dev/null | wc -l ) + if test "$err" != "0"; then + exit 77 + fi + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + setcap "= cap_chown=ei" $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + getcap $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + rm -rf $file + + +mkdir dir +genfile --file dir/file + +setcap "= cap_chown=ei" dir/file + +# archive whole directory including binary xattrs +tar --xattrs -cf archive.tar dir + +# clear the directory +rm -rf dir + +# restore _all_ xattrs (not just the user.* domain) +tar --xattrs --xattrs-include='*' -xf archive.tar + +getcap dir/file +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "dir/file = cap_chown+ei +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/capabs_raw01.at:28" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/capabs_raw01.at:28: +mkdir ustar +(cd ustar +TEST_TAR_FORMAT=ustar +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H ustar\" +export TAR_OPTIONS +rm -rf * + + +echo \"test\" > \$\$ +chmod 0 \$\$ +cat \$\$ > /dev/null 2>&1 +result=\$? +rm -f \$\$ +test \$result -eq 0 || exit 77 + + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + + setfattr -n user.test -v test \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + getfattr \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + setfattr -n user.test -v ahoj \$file + # check whether tar fails to store xattrs + err=\$( tar --xattrs -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) + if test \"\$err\" != \"0\"; then + exit 77 + fi + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + + setcap \"= cap_chown=ei\" \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + getcap \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + rm -rf \$file + + +mkdir dir +genfile --file dir/file + +setcap \"= cap_chown=ei\" dir/file + +# archive whole directory including binary xattrs +tar --xattrs -cf archive.tar dir + +# clear the directory +rm -rf dir + +# restore _all_ xattrs (not just the user.* domain) +tar --xattrs --xattrs-include='*' -xf archive.tar + +getcap dir/file +)" +at_fn_check_prepare_notrace 'a $(...) command substitution' "capabs_raw01.at:28" +( $at_check_trace; +mkdir ustar +(cd ustar +TEST_TAR_FORMAT=ustar +export TEST_TAR_FORMAT +TAR_OPTIONS="-H ustar" +export TAR_OPTIONS +rm -rf * + + +echo "test" > $$ +chmod 0 $$ +cat $$ > /dev/null 2>&1 +result=$? +rm -f $$ +test $result -eq 0 || exit 77 + + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + setfattr -n user.test -v test $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + getfattr $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + file=$(TMPDIR=. mktemp fiXXXXXX) + setfattr -n user.test -v ahoj $file + # check whether tar fails to store xattrs + err=$( tar --xattrs -cf /dev/null $file 2>&1 >/dev/null | wc -l ) + if test "$err" != "0"; then + exit 77 + fi + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + setcap "= cap_chown=ei" $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + getcap $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + rm -rf $file + + +mkdir dir +genfile --file dir/file + +setcap "= cap_chown=ei" dir/file + +# archive whole directory including binary xattrs +tar --xattrs -cf archive.tar dir + +# clear the directory +rm -rf dir + +# restore _all_ xattrs (not just the user.* domain) +tar --xattrs --xattrs-include='*' -xf archive.tar + +getcap dir/file +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "dir/file = cap_chown+ei +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/capabs_raw01.at:28" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/capabs_raw01.at:28: +mkdir posix +(cd posix +TEST_TAR_FORMAT=posix +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H posix\" +export TAR_OPTIONS +rm -rf * + + +echo \"test\" > \$\$ +chmod 0 \$\$ +cat \$\$ > /dev/null 2>&1 +result=\$? +rm -f \$\$ +test \$result -eq 0 || exit 77 + + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + + setfattr -n user.test -v test \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + getfattr \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + setfattr -n user.test -v ahoj \$file + # check whether tar fails to store xattrs + err=\$( tar --xattrs -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) + if test \"\$err\" != \"0\"; then + exit 77 + fi + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + + setcap \"= cap_chown=ei\" \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + getcap \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + rm -rf \$file + + +mkdir dir +genfile --file dir/file + +setcap \"= cap_chown=ei\" dir/file + +# archive whole directory including binary xattrs +tar --xattrs -cf archive.tar dir + +# clear the directory +rm -rf dir + +# restore _all_ xattrs (not just the user.* domain) +tar --xattrs --xattrs-include='*' -xf archive.tar + +getcap dir/file +)" +at_fn_check_prepare_notrace 'a $(...) command substitution' "capabs_raw01.at:28" +( $at_check_trace; +mkdir posix +(cd posix +TEST_TAR_FORMAT=posix +export TEST_TAR_FORMAT +TAR_OPTIONS="-H posix" +export TAR_OPTIONS +rm -rf * + + +echo "test" > $$ +chmod 0 $$ +cat $$ > /dev/null 2>&1 +result=$? +rm -f $$ +test $result -eq 0 || exit 77 + + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + setfattr -n user.test -v test $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + getfattr $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + file=$(TMPDIR=. mktemp fiXXXXXX) + setfattr -n user.test -v ahoj $file + # check whether tar fails to store xattrs + err=$( tar --xattrs -cf /dev/null $file 2>&1 >/dev/null | wc -l ) + if test "$err" != "0"; then + exit 77 + fi + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + setcap "= cap_chown=ei" $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + getcap $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + rm -rf $file + + +mkdir dir +genfile --file dir/file + +setcap "= cap_chown=ei" dir/file + +# archive whole directory including binary xattrs +tar --xattrs -cf archive.tar dir + +# clear the directory +rm -rf dir + +# restore _all_ xattrs (not just the user.* domain) +tar --xattrs --xattrs-include='*' -xf archive.tar + +getcap dir/file +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "dir/file = cap_chown+ei +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/capabs_raw01.at:28" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/capabs_raw01.at:28: +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H gnu\" +export TAR_OPTIONS +rm -rf * + + +echo \"test\" > \$\$ +chmod 0 \$\$ +cat \$\$ > /dev/null 2>&1 +result=\$? +rm -f \$\$ +test \$result -eq 0 || exit 77 + + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + + setfattr -n user.test -v test \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + getfattr \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + setfattr -n user.test -v ahoj \$file + # check whether tar fails to store xattrs + err=\$( tar --xattrs -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) + if test \"\$err\" != \"0\"; then + exit 77 + fi + + + file=\$(TMPDIR=. mktemp fiXXXXXX) + + setcap \"= cap_chown=ei\" \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + + getcap \$file &> /dev/null + if test \"\$?\" != 0; then + exit 77 + fi + + rm -rf \$file + + +mkdir dir +genfile --file dir/file + +setcap \"= cap_chown=ei\" dir/file + +# archive whole directory including binary xattrs +tar --xattrs -cf archive.tar dir + +# clear the directory +rm -rf dir + +# restore _all_ xattrs (not just the user.* domain) +tar --xattrs --xattrs-include='*' -xf archive.tar + +getcap dir/file +)" +at_fn_check_prepare_notrace 'a $(...) command substitution' "capabs_raw01.at:28" +( $at_check_trace; +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS="-H gnu" +export TAR_OPTIONS +rm -rf * + + +echo "test" > $$ +chmod 0 $$ +cat $$ > /dev/null 2>&1 +result=$? +rm -f $$ +test $result -eq 0 || exit 77 + + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + setfattr -n user.test -v test $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + getfattr $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + file=$(TMPDIR=. mktemp fiXXXXXX) + setfattr -n user.test -v ahoj $file + # check whether tar fails to store xattrs + err=$( tar --xattrs -cf /dev/null $file 2>&1 >/dev/null | wc -l ) + if test "$err" != "0"; then + exit 77 + fi + + + file=$(TMPDIR=. mktemp fiXXXXXX) + + setcap "= cap_chown=ei" $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + + getcap $file &> /dev/null + if test "$?" != 0; then + exit 77 + fi + + rm -rf $file + + +mkdir dir +genfile --file dir/file + +setcap "= cap_chown=ei" dir/file + +# archive whole directory including binary xattrs +tar --xattrs -cf archive.tar dir + +# clear the directory +rm -rf dir + +# restore _all_ xattrs (not just the user.* domain) +tar --xattrs --xattrs-include='*' -xf archive.tar + +getcap dir/file +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "dir/file = cap_chown+ei +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/capabs_raw01.at:28" +$at_failed && at_fn_log_failure +$at_traceon; } + + + + + set +x + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 7>&- | eval $at_tee_pipe +read at_status <"$at_status_file" +#AT_STOP_178 +#AT_START_179 +at_fn_group_banner 179 'onetop01.at:21' \ + "tar --one-top-level" " " 26 +at_xfail=no + test -f $XFAILFILE && at_xfail=yes +( + $as_echo "179. $at_setup_line: testing $at_desc ..." + $at_traceon + + + + + + { set +x +$as_echo "$at_srcdir/onetop01.at:24: +mkdir v7 +(cd v7 +TEST_TAR_FORMAT=v7 +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H v7\" +export TAR_OPTIONS +rm -rf * + + +test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level -x -f ../a.tar +find . | sort +)" +at_fn_check_prepare_notrace 'a `...` command substitution' "onetop01.at:24" +( $at_check_trace; +mkdir v7 +(cd v7 +TEST_TAR_FORMAT=v7 +export TEST_TAR_FORMAT +TAR_OPTIONS="-H v7" +export TAR_OPTIONS +rm -rf * + + +test -z "`sort < /dev/null 2>&1`" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level -x -f ../a.tar +find . | sort +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo ". +./a +./a/b +./a/c +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/onetop01.at:24" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/onetop01.at:24: +mkdir oldgnu +(cd oldgnu +TEST_TAR_FORMAT=oldgnu +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H oldgnu\" +export TAR_OPTIONS +rm -rf * + + +test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level -x -f ../a.tar +find . | sort +)" +at_fn_check_prepare_notrace 'a `...` command substitution' "onetop01.at:24" +( $at_check_trace; +mkdir oldgnu +(cd oldgnu +TEST_TAR_FORMAT=oldgnu +export TEST_TAR_FORMAT +TAR_OPTIONS="-H oldgnu" +export TAR_OPTIONS +rm -rf * + + +test -z "`sort < /dev/null 2>&1`" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level -x -f ../a.tar +find . | sort +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo ". +./a +./a/b +./a/c +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/onetop01.at:24" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/onetop01.at:24: +mkdir ustar +(cd ustar +TEST_TAR_FORMAT=ustar +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H ustar\" +export TAR_OPTIONS +rm -rf * + + +test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level -x -f ../a.tar +find . | sort +)" +at_fn_check_prepare_notrace 'a `...` command substitution' "onetop01.at:24" +( $at_check_trace; +mkdir ustar +(cd ustar +TEST_TAR_FORMAT=ustar +export TEST_TAR_FORMAT +TAR_OPTIONS="-H ustar" +export TAR_OPTIONS +rm -rf * + + +test -z "`sort < /dev/null 2>&1`" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level -x -f ../a.tar +find . | sort +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo ". +./a +./a/b +./a/c +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/onetop01.at:24" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/onetop01.at:24: +mkdir posix +(cd posix +TEST_TAR_FORMAT=posix +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H posix\" +export TAR_OPTIONS +rm -rf * + + +test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level -x -f ../a.tar +find . | sort +)" +at_fn_check_prepare_notrace 'a `...` command substitution' "onetop01.at:24" +( $at_check_trace; +mkdir posix +(cd posix +TEST_TAR_FORMAT=posix +export TEST_TAR_FORMAT +TAR_OPTIONS="-H posix" +export TAR_OPTIONS +rm -rf * + + +test -z "`sort < /dev/null 2>&1`" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level -x -f ../a.tar +find . | sort +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo ". +./a +./a/b +./a/c +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/onetop01.at:24" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/onetop01.at:24: +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H gnu\" +export TAR_OPTIONS +rm -rf * + + +test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level -x -f ../a.tar +find . | sort +)" +at_fn_check_prepare_notrace 'a `...` command substitution' "onetop01.at:24" +( $at_check_trace; +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS="-H gnu" +export TAR_OPTIONS +rm -rf * + + +test -z "`sort < /dev/null 2>&1`" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level -x -f ../a.tar +find . | sort +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo ". +./a +./a/b +./a/c +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/onetop01.at:24" +$at_failed && at_fn_log_failure +$at_traceon; } + + + + + set +x + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 7>&- | eval $at_tee_pipe +read at_status <"$at_status_file" +#AT_STOP_179 +#AT_START_180 +at_fn_group_banner 180 'onetop02.at:21' \ + "tar --one-top-level --show-transformed" " " 26 +at_xfail=no + test -f $XFAILFILE && at_xfail=yes +( + $as_echo "180. $at_setup_line: testing $at_desc ..." + $at_traceon + + + + + + { set +x +$as_echo "$at_srcdir/onetop02.at:24: +mkdir v7 +(cd v7 +TEST_TAR_FORMAT=v7 +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H v7\" +export TAR_OPTIONS +rm -rf * + + +test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level --show-transformed -v -x -f ../a.tar +find . | sort +)" +at_fn_check_prepare_notrace 'a `...` command substitution' "onetop02.at:24" +( $at_check_trace; +mkdir v7 +(cd v7 +TEST_TAR_FORMAT=v7 +export TEST_TAR_FORMAT +TAR_OPTIONS="-H v7" +export TAR_OPTIONS +rm -rf * + + +test -z "`sort < /dev/null 2>&1`" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level --show-transformed -v -x -f ../a.tar +find . | sort +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "a/ +a/b +a/c +. +./a +./a/b +./a/c +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/onetop02.at:24" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/onetop02.at:24: +mkdir oldgnu +(cd oldgnu +TEST_TAR_FORMAT=oldgnu +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H oldgnu\" +export TAR_OPTIONS +rm -rf * + + +test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level --show-transformed -v -x -f ../a.tar +find . | sort +)" +at_fn_check_prepare_notrace 'a `...` command substitution' "onetop02.at:24" +( $at_check_trace; +mkdir oldgnu +(cd oldgnu +TEST_TAR_FORMAT=oldgnu +export TEST_TAR_FORMAT +TAR_OPTIONS="-H oldgnu" +export TAR_OPTIONS +rm -rf * + + +test -z "`sort < /dev/null 2>&1`" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level --show-transformed -v -x -f ../a.tar +find . | sort +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "a/ +a/b +a/c +. +./a +./a/b +./a/c +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/onetop02.at:24" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/onetop02.at:24: +mkdir ustar +(cd ustar +TEST_TAR_FORMAT=ustar +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H ustar\" +export TAR_OPTIONS +rm -rf * + + +test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level --show-transformed -v -x -f ../a.tar +find . | sort +)" +at_fn_check_prepare_notrace 'a `...` command substitution' "onetop02.at:24" +( $at_check_trace; +mkdir ustar +(cd ustar +TEST_TAR_FORMAT=ustar +export TEST_TAR_FORMAT +TAR_OPTIONS="-H ustar" +export TAR_OPTIONS +rm -rf * + + +test -z "`sort < /dev/null 2>&1`" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level --show-transformed -v -x -f ../a.tar +find . | sort +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "a/ +a/b +a/c +. +./a +./a/b +./a/c +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/onetop02.at:24" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/onetop02.at:24: +mkdir posix +(cd posix +TEST_TAR_FORMAT=posix +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H posix\" +export TAR_OPTIONS +rm -rf * + + +test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level --show-transformed -v -x -f ../a.tar +find . | sort +)" +at_fn_check_prepare_notrace 'a `...` command substitution' "onetop02.at:24" +( $at_check_trace; +mkdir posix +(cd posix +TEST_TAR_FORMAT=posix +export TEST_TAR_FORMAT +TAR_OPTIONS="-H posix" +export TAR_OPTIONS +rm -rf * + + +test -z "`sort < /dev/null 2>&1`" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level --show-transformed -v -x -f ../a.tar +find . | sort +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "a/ +a/b +a/c +. +./a +./a/b +./a/c +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/onetop02.at:24" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/onetop02.at:24: +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H gnu\" +export TAR_OPTIONS +rm -rf * + + +test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level --show-transformed -v -x -f ../a.tar +find . | sort +)" +at_fn_check_prepare_notrace 'a `...` command substitution' "onetop02.at:24" +( $at_check_trace; +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS="-H gnu" +export TAR_OPTIONS +rm -rf * + + +test -z "`sort < /dev/null 2>&1`" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level --show-transformed -v -x -f ../a.tar +find . | sort +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "a/ +a/b +a/c +. +./a +./a/b +./a/c +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/onetop02.at:24" +$at_failed && at_fn_log_failure +$at_traceon; } + + + + + set +x + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 7>&- | eval $at_tee_pipe +read at_status <"$at_status_file" +#AT_STOP_180 +#AT_START_181 +at_fn_group_banner 181 'onetop03.at:21' \ + "tar --one-top-level --transform" " " 26 +at_xfail=no + test -f $XFAILFILE && at_xfail=yes +( + $as_echo "181. $at_setup_line: testing $at_desc ..." + $at_traceon + + + + + + { set +x +$as_echo "$at_srcdir/onetop03.at:24: +mkdir v7 +(cd v7 +TEST_TAR_FORMAT=v7 +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H v7\" +export TAR_OPTIONS +rm -rf * + + +test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level --transform 's/c/d/' -x -f ../a.tar +find . | sort +)" +at_fn_check_prepare_notrace 'a `...` command substitution' "onetop03.at:24" +( $at_check_trace; +mkdir v7 +(cd v7 +TEST_TAR_FORMAT=v7 +export TEST_TAR_FORMAT +TAR_OPTIONS="-H v7" +export TAR_OPTIONS +rm -rf * + + +test -z "`sort < /dev/null 2>&1`" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level --transform 's/c/d/' -x -f ../a.tar +find . | sort +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo ". +./a +./a/b +./a/d +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/onetop03.at:24" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/onetop03.at:24: +mkdir oldgnu +(cd oldgnu +TEST_TAR_FORMAT=oldgnu +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H oldgnu\" +export TAR_OPTIONS +rm -rf * + + +test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level --transform 's/c/d/' -x -f ../a.tar +find . | sort +)" +at_fn_check_prepare_notrace 'a `...` command substitution' "onetop03.at:24" +( $at_check_trace; +mkdir oldgnu +(cd oldgnu +TEST_TAR_FORMAT=oldgnu +export TEST_TAR_FORMAT +TAR_OPTIONS="-H oldgnu" +export TAR_OPTIONS +rm -rf * + + +test -z "`sort < /dev/null 2>&1`" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level --transform 's/c/d/' -x -f ../a.tar +find . | sort +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo ". +./a +./a/b +./a/d +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/onetop03.at:24" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/onetop03.at:24: +mkdir ustar +(cd ustar +TEST_TAR_FORMAT=ustar +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H ustar\" +export TAR_OPTIONS +rm -rf * + + +test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level --transform 's/c/d/' -x -f ../a.tar +find . | sort +)" +at_fn_check_prepare_notrace 'a `...` command substitution' "onetop03.at:24" +( $at_check_trace; +mkdir ustar +(cd ustar +TEST_TAR_FORMAT=ustar +export TEST_TAR_FORMAT +TAR_OPTIONS="-H ustar" +export TAR_OPTIONS +rm -rf * + + +test -z "`sort < /dev/null 2>&1`" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level --transform 's/c/d/' -x -f ../a.tar +find . | sort +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo ". +./a +./a/b +./a/d +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/onetop03.at:24" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/onetop03.at:24: +mkdir posix +(cd posix +TEST_TAR_FORMAT=posix +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H posix\" +export TAR_OPTIONS +rm -rf * + + +test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level --transform 's/c/d/' -x -f ../a.tar +find . | sort +)" +at_fn_check_prepare_notrace 'a `...` command substitution' "onetop03.at:24" +( $at_check_trace; +mkdir posix +(cd posix +TEST_TAR_FORMAT=posix +export TEST_TAR_FORMAT +TAR_OPTIONS="-H posix" +export TAR_OPTIONS +rm -rf * + + +test -z "`sort < /dev/null 2>&1`" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level --transform 's/c/d/' -x -f ../a.tar +find . | sort +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo ". +./a +./a/b +./a/d +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/onetop03.at:24" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/onetop03.at:24: +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H gnu\" +export TAR_OPTIONS +rm -rf * + + +test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level --transform 's/c/d/' -x -f ../a.tar +find . | sort +)" +at_fn_check_prepare_notrace 'a `...` command substitution' "onetop03.at:24" +( $at_check_trace; +mkdir gnu +(cd gnu +TEST_TAR_FORMAT=gnu +export TEST_TAR_FORMAT +TAR_OPTIONS="-H gnu" +export TAR_OPTIONS +rm -rf * + + +test -z "`sort < /dev/null 2>&1`" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +mkdir out +cd out +tar --one-top-level --transform 's/c/d/' -x -f ../a.tar +find . | sort +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo ". +./a +./a/b +./a/d +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/onetop03.at:24" +$at_failed && at_fn_log_failure +$at_traceon; } + + + + + set +x + $at_times_p && times >"$at_times_file" +) 5>&1 2>&1 7>&- | eval $at_tee_pipe +read at_status <"$at_status_file" +#AT_STOP_181 +#AT_START_182 +at_fn_group_banner 182 'onetop04.at:21' \ + "tar --one-top-level --transform" " " 26 +at_xfail=no + test -f $XFAILFILE && at_xfail=yes +( + $as_echo "182. $at_setup_line: testing $at_desc ..." + $at_traceon + + + + + + { set +x +$as_echo "$at_srcdir/onetop04.at:24: +mkdir v7 +(cd v7 +TEST_TAR_FORMAT=v7 +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H v7\" +export TAR_OPTIONS +rm -rf * + + +test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +tar -tf a.tar --one-top-level --transform 's/c/d/' --show-transformed | sort +)" +at_fn_check_prepare_notrace 'a `...` command substitution' "onetop04.at:24" +( $at_check_trace; +mkdir v7 +(cd v7 +TEST_TAR_FORMAT=v7 +export TEST_TAR_FORMAT +TAR_OPTIONS="-H v7" +export TAR_OPTIONS +rm -rf * + + +test -z "`sort < /dev/null 2>&1`" || exit 77 + +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +tar -tf a.tar --one-top-level --transform 's/c/d/' --show-transformed | sort +) +) >>"$at_stdout" 2>>"$at_stderr" 5>&- +at_status=$? at_failed=false +$at_check_filter +at_fn_diff_devnull "$at_stderr" || at_failed=: +echo >>"$at_stdout"; $as_echo "a/ +a/b +a/d +" | \ + $at_diff - "$at_stdout" || at_failed=: +at_fn_check_status 0 $at_status "$at_srcdir/onetop04.at:24" +$at_failed && at_fn_log_failure +$at_traceon; } + + { set +x +$as_echo "$at_srcdir/onetop04.at:24: +mkdir oldgnu +(cd oldgnu +TEST_TAR_FORMAT=oldgnu +export TEST_TAR_FORMAT +TAR_OPTIONS=\"-H oldgnu\" +export TAR_OPTIONS +rm -rf * -# clear the directory -rm -rf dir -# restore _all_ xattrs (not just the user.* domain) -tar --xattrs --xattrs-include='*' -xf archive.tar +test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 -getcap dir/file +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +tar -tf a.tar --one-top-level --transform 's/c/d/' --show-transformed | sort )" -at_fn_check_prepare_notrace 'a $(...) command substitution' "capabs_raw01.at:28" +at_fn_check_prepare_notrace 'a `...` command substitution' "onetop04.at:24" ( $at_check_trace; mkdir oldgnu (cd oldgnu @@ -41950,83 +46319,29 @@ export TAR_OPTIONS rm -rf * -echo "test" > $$ -chmod 0 $$ -cat $$ > /dev/null 2>&1 -result=$? -rm -f $$ -test $result -eq 0 || exit 77 - - - - file=$(TMPDIR=. mktemp fiXXXXXX) - - setfattr -n user.test -v test $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi - - - getfattr $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi - - - file=$(TMPDIR=. mktemp fiXXXXXX) - setfattr -n user.test -v ahoj $file - # check whether tar fails to store xattrs - err=$( tar --xattrs -cf /dev/null $file 2>&1 >/dev/null | wc -l ) - if test "$err" != "0"; then - exit 77 - fi - - - file=$(TMPDIR=. mktemp fiXXXXXX) - - setcap "= cap_chown=ei" $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi - - - getcap $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi - - rm -rf $file - - -mkdir dir -genfile --file dir/file - -setcap "= cap_chown=ei" dir/file - -# archive whole directory including binary xattrs -tar --xattrs -cf archive.tar dir - -# clear the directory -rm -rf dir - -# restore _all_ xattrs (not just the user.* domain) -tar --xattrs --xattrs-include='*' -xf archive.tar +test -z "`sort < /dev/null 2>&1`" || exit 77 -getcap dir/file +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +tar -tf a.tar --one-top-level --transform 's/c/d/' --show-transformed | sort ) ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: -echo >>"$at_stdout"; $as_echo "dir/file = cap_chown+ei +echo >>"$at_stdout"; $as_echo "a/ +a/b +a/d " | \ $at_diff - "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/capabs_raw01.at:28" +at_fn_check_status 0 $at_status "$at_srcdir/onetop04.at:24" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/capabs_raw01.at:28: +$as_echo "$at_srcdir/onetop04.at:24: mkdir ustar (cd ustar TEST_TAR_FORMAT=ustar @@ -42036,71 +46351,15 @@ export TAR_OPTIONS rm -rf * -echo \"test\" > \$\$ -chmod 0 \$\$ -cat \$\$ > /dev/null 2>&1 -result=\$? -rm -f \$\$ -test \$result -eq 0 || exit 77 - - - - file=\$(TMPDIR=. mktemp fiXXXXXX) - - setfattr -n user.test -v test \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi - - - getfattr \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi - - - file=\$(TMPDIR=. mktemp fiXXXXXX) - setfattr -n user.test -v ahoj \$file - # check whether tar fails to store xattrs - err=\$( tar --xattrs -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) - if test \"\$err\" != \"0\"; then - exit 77 - fi - - - file=\$(TMPDIR=. mktemp fiXXXXXX) - - setcap \"= cap_chown=ei\" \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi - - - getcap \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi - - rm -rf \$file - - -mkdir dir -genfile --file dir/file - -setcap \"= cap_chown=ei\" dir/file - -# archive whole directory including binary xattrs -tar --xattrs -cf archive.tar dir - -# clear the directory -rm -rf dir - -# restore _all_ xattrs (not just the user.* domain) -tar --xattrs --xattrs-include='*' -xf archive.tar +test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 -getcap dir/file +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +tar -tf a.tar --one-top-level --transform 's/c/d/' --show-transformed | sort )" -at_fn_check_prepare_notrace 'a $(...) command substitution' "capabs_raw01.at:28" +at_fn_check_prepare_notrace 'a `...` command substitution' "onetop04.at:24" ( $at_check_trace; mkdir ustar (cd ustar @@ -42111,83 +46370,29 @@ export TAR_OPTIONS rm -rf * -echo "test" > $$ -chmod 0 $$ -cat $$ > /dev/null 2>&1 -result=$? -rm -f $$ -test $result -eq 0 || exit 77 - - - - file=$(TMPDIR=. mktemp fiXXXXXX) - - setfattr -n user.test -v test $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi - - - getfattr $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi - - - file=$(TMPDIR=. mktemp fiXXXXXX) - setfattr -n user.test -v ahoj $file - # check whether tar fails to store xattrs - err=$( tar --xattrs -cf /dev/null $file 2>&1 >/dev/null | wc -l ) - if test "$err" != "0"; then - exit 77 - fi - - - file=$(TMPDIR=. mktemp fiXXXXXX) - - setcap "= cap_chown=ei" $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi - - - getcap $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi - - rm -rf $file - - -mkdir dir -genfile --file dir/file - -setcap "= cap_chown=ei" dir/file - -# archive whole directory including binary xattrs -tar --xattrs -cf archive.tar dir - -# clear the directory -rm -rf dir - -# restore _all_ xattrs (not just the user.* domain) -tar --xattrs --xattrs-include='*' -xf archive.tar +test -z "`sort < /dev/null 2>&1`" || exit 77 -getcap dir/file +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +tar -tf a.tar --one-top-level --transform 's/c/d/' --show-transformed | sort ) ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: -echo >>"$at_stdout"; $as_echo "dir/file = cap_chown+ei +echo >>"$at_stdout"; $as_echo "a/ +a/b +a/d " | \ $at_diff - "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/capabs_raw01.at:28" +at_fn_check_status 0 $at_status "$at_srcdir/onetop04.at:24" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/capabs_raw01.at:28: +$as_echo "$at_srcdir/onetop04.at:24: mkdir posix (cd posix TEST_TAR_FORMAT=posix @@ -42197,71 +46402,15 @@ export TAR_OPTIONS rm -rf * -echo \"test\" > \$\$ -chmod 0 \$\$ -cat \$\$ > /dev/null 2>&1 -result=\$? -rm -f \$\$ -test \$result -eq 0 || exit 77 - - - - file=\$(TMPDIR=. mktemp fiXXXXXX) - - setfattr -n user.test -v test \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi - - - getfattr \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi - - - file=\$(TMPDIR=. mktemp fiXXXXXX) - setfattr -n user.test -v ahoj \$file - # check whether tar fails to store xattrs - err=\$( tar --xattrs -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) - if test \"\$err\" != \"0\"; then - exit 77 - fi - - - file=\$(TMPDIR=. mktemp fiXXXXXX) - - setcap \"= cap_chown=ei\" \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi - - - getcap \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi - - rm -rf \$file - - -mkdir dir -genfile --file dir/file - -setcap \"= cap_chown=ei\" dir/file - -# archive whole directory including binary xattrs -tar --xattrs -cf archive.tar dir - -# clear the directory -rm -rf dir - -# restore _all_ xattrs (not just the user.* domain) -tar --xattrs --xattrs-include='*' -xf archive.tar +test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 -getcap dir/file +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +tar -tf a.tar --one-top-level --transform 's/c/d/' --show-transformed | sort )" -at_fn_check_prepare_notrace 'a $(...) command substitution' "capabs_raw01.at:28" +at_fn_check_prepare_notrace 'a `...` command substitution' "onetop04.at:24" ( $at_check_trace; mkdir posix (cd posix @@ -42272,83 +46421,29 @@ export TAR_OPTIONS rm -rf * -echo "test" > $$ -chmod 0 $$ -cat $$ > /dev/null 2>&1 -result=$? -rm -f $$ -test $result -eq 0 || exit 77 - - - - file=$(TMPDIR=. mktemp fiXXXXXX) - - setfattr -n user.test -v test $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi - - - getfattr $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi - - - file=$(TMPDIR=. mktemp fiXXXXXX) - setfattr -n user.test -v ahoj $file - # check whether tar fails to store xattrs - err=$( tar --xattrs -cf /dev/null $file 2>&1 >/dev/null | wc -l ) - if test "$err" != "0"; then - exit 77 - fi - - - file=$(TMPDIR=. mktemp fiXXXXXX) - - setcap "= cap_chown=ei" $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi - - - getcap $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi - - rm -rf $file - - -mkdir dir -genfile --file dir/file - -setcap "= cap_chown=ei" dir/file - -# archive whole directory including binary xattrs -tar --xattrs -cf archive.tar dir - -# clear the directory -rm -rf dir - -# restore _all_ xattrs (not just the user.* domain) -tar --xattrs --xattrs-include='*' -xf archive.tar +test -z "`sort < /dev/null 2>&1`" || exit 77 -getcap dir/file +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +tar -tf a.tar --one-top-level --transform 's/c/d/' --show-transformed | sort ) ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: -echo >>"$at_stdout"; $as_echo "dir/file = cap_chown+ei +echo >>"$at_stdout"; $as_echo "a/ +a/b +a/d " | \ $at_diff - "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/capabs_raw01.at:28" +at_fn_check_status 0 $at_status "$at_srcdir/onetop04.at:24" $at_failed && at_fn_log_failure $at_traceon; } { set +x -$as_echo "$at_srcdir/capabs_raw01.at:28: +$as_echo "$at_srcdir/onetop04.at:24: mkdir gnu (cd gnu TEST_TAR_FORMAT=gnu @@ -42358,71 +46453,15 @@ export TAR_OPTIONS rm -rf * -echo \"test\" > \$\$ -chmod 0 \$\$ -cat \$\$ > /dev/null 2>&1 -result=\$? -rm -f \$\$ -test \$result -eq 0 || exit 77 - - - - file=\$(TMPDIR=. mktemp fiXXXXXX) - - setfattr -n user.test -v test \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi - - - getfattr \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi - - - file=\$(TMPDIR=. mktemp fiXXXXXX) - setfattr -n user.test -v ahoj \$file - # check whether tar fails to store xattrs - err=\$( tar --xattrs -cf /dev/null \$file 2>&1 >/dev/null | wc -l ) - if test \"\$err\" != \"0\"; then - exit 77 - fi - - - file=\$(TMPDIR=. mktemp fiXXXXXX) - - setcap \"= cap_chown=ei\" \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi - - - getcap \$file &> /dev/null - if test \"\$?\" != 0; then - exit 77 - fi - - rm -rf \$file - - -mkdir dir -genfile --file dir/file - -setcap \"= cap_chown=ei\" dir/file - -# archive whole directory including binary xattrs -tar --xattrs -cf archive.tar dir - -# clear the directory -rm -rf dir - -# restore _all_ xattrs (not just the user.* domain) -tar --xattrs --xattrs-include='*' -xf archive.tar +test -z \"\`sort < /dev/null 2>&1\`\" || exit 77 -getcap dir/file +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +tar -tf a.tar --one-top-level --transform 's/c/d/' --show-transformed | sort )" -at_fn_check_prepare_notrace 'a $(...) command substitution' "capabs_raw01.at:28" +at_fn_check_prepare_notrace 'a `...` command substitution' "onetop04.at:24" ( $at_check_trace; mkdir gnu (cd gnu @@ -42433,78 +46472,24 @@ export TAR_OPTIONS rm -rf * -echo "test" > $$ -chmod 0 $$ -cat $$ > /dev/null 2>&1 -result=$? -rm -f $$ -test $result -eq 0 || exit 77 - - - - file=$(TMPDIR=. mktemp fiXXXXXX) - - setfattr -n user.test -v test $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi - - - getfattr $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi - - - file=$(TMPDIR=. mktemp fiXXXXXX) - setfattr -n user.test -v ahoj $file - # check whether tar fails to store xattrs - err=$( tar --xattrs -cf /dev/null $file 2>&1 >/dev/null | wc -l ) - if test "$err" != "0"; then - exit 77 - fi - - - file=$(TMPDIR=. mktemp fiXXXXXX) - - setcap "= cap_chown=ei" $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi - - - getcap $file &> /dev/null - if test "$?" != 0; then - exit 77 - fi - - rm -rf $file - - -mkdir dir -genfile --file dir/file - -setcap "= cap_chown=ei" dir/file - -# archive whole directory including binary xattrs -tar --xattrs -cf archive.tar dir - -# clear the directory -rm -rf dir - -# restore _all_ xattrs (not just the user.* domain) -tar --xattrs --xattrs-include='*' -xf archive.tar +test -z "`sort < /dev/null 2>&1`" || exit 77 -getcap dir/file +mkdir a +genfile --file a/b +genfile --file c +tar cf a.tar a c +tar -tf a.tar --one-top-level --transform 's/c/d/' --show-transformed | sort ) ) >>"$at_stdout" 2>>"$at_stderr" 5>&- at_status=$? at_failed=false $at_check_filter at_fn_diff_devnull "$at_stderr" || at_failed=: -echo >>"$at_stdout"; $as_echo "dir/file = cap_chown+ei +echo >>"$at_stdout"; $as_echo "a/ +a/b +a/d " | \ $at_diff - "$at_stdout" || at_failed=: -at_fn_check_status 0 $at_status "$at_srcdir/capabs_raw01.at:28" +at_fn_check_status 0 $at_status "$at_srcdir/onetop04.at:24" $at_failed && at_fn_log_failure $at_traceon; } @@ -42515,13 +46500,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_174 -#AT_START_175 -at_fn_group_banner 175 'gtarfail.at:21' \ - "gtarfail" " " 26 +#AT_STOP_182 +#AT_START_183 +at_fn_group_banner 183 'gtarfail.at:21' \ + "gtarfail" " " 27 at_xfail=no ( - $as_echo "175. $at_setup_line: testing $at_desc ..." + $as_echo "183. $at_setup_line: testing $at_desc ..." $at_traceon @@ -42567,13 +46552,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_175 -#AT_START_176 -at_fn_group_banner 176 'gtarfail2.at:21' \ - "gtarfail2" " " 26 +#AT_STOP_183 +#AT_START_184 +at_fn_group_banner 184 'gtarfail2.at:21' \ + "gtarfail2" " " 27 at_xfail=no ( - $as_echo "176. $at_setup_line: testing $at_desc ..." + $as_echo "184. $at_setup_line: testing $at_desc ..." $at_traceon @@ -42621,13 +46606,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_176 -#AT_START_177 -at_fn_group_banner 177 'multi-fail.at:21' \ - "multi-fail" " " 26 +#AT_STOP_184 +#AT_START_185 +at_fn_group_banner 185 'multi-fail.at:21' \ + "multi-fail" " " 27 at_xfail=no ( - $as_echo "177. $at_setup_line: testing $at_desc ..." + $as_echo "185. $at_setup_line: testing $at_desc ..." $at_traceon @@ -42729,13 +46714,13 @@ $at_traceon; } $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_177 -#AT_START_178 -at_fn_group_banner 178 'ustar-big-2g.at:21' \ - "ustar-big-2g" " " 26 +#AT_STOP_185 +#AT_START_186 +at_fn_group_banner 186 'ustar-big-2g.at:21' \ + "ustar-big-2g" " " 27 at_xfail=no ( - $as_echo "178. $at_setup_line: testing $at_desc ..." + $as_echo "186. $at_setup_line: testing $at_desc ..." $at_traceon @@ -42796,13 +46781,13 @@ done $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_178 -#AT_START_179 -at_fn_group_banner 179 'ustar-big-8g.at:21' \ - "ustar-big-8g" " " 26 +#AT_STOP_186 +#AT_START_187 +at_fn_group_banner 187 'ustar-big-8g.at:21' \ + "ustar-big-8g" " " 27 at_xfail=no ( - $as_echo "179. $at_setup_line: testing $at_desc ..." + $as_echo "187. $at_setup_line: testing $at_desc ..." $at_traceon @@ -42863,13 +46848,13 @@ done $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_179 -#AT_START_180 -at_fn_group_banner 180 'pax-big-10g.at:21' \ - "pax-big-10g" " " 26 +#AT_STOP_187 +#AT_START_188 +at_fn_group_banner 188 'pax-big-10g.at:21' \ + "pax-big-10g" " " 27 at_xfail=no ( - $as_echo "180. $at_setup_line: testing $at_desc ..." + $as_echo "188. $at_setup_line: testing $at_desc ..." $at_traceon @@ -42930,4 +46915,4 @@ done $at_times_p && times >"$at_times_file" ) 5>&1 2>&1 7>&- | eval $at_tee_pipe read at_status <"$at_status_file" -#AT_STOP_180 +#AT_STOP_188 diff --git a/tests/testsuite.at b/tests/testsuite.at index 1aab6f7..7f8e4c4 100644 --- a/tests/testsuite.at +++ b/tests/testsuite.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004-2008, 2010-2013 Free Software Foundation, Inc. +# Copyright 2004-2008, 2010-2014 Free Software Foundation, Inc. # This file is part of GNU tar. @@ -211,7 +211,9 @@ m4_include([indexfile.at]) m4_include([verbose.at]) m4_include([gzip.at]) m4_include([recurse.at]) +m4_include([recurs02.at]) m4_include([shortrec.at]) +m4_include([iotty.at]) AT_BANNER([The --same-order option]) m4_include([same-order01.at]) @@ -397,6 +399,7 @@ m4_include([remfiles08c.at]) m4_include([remfiles09a.at]) m4_include([remfiles09b.at]) m4_include([remfiles09c.at]) +m4_include([remfiles10.at]) AT_BANNER([Extended attributes]) m4_include([xattr01.at]) @@ -407,12 +410,19 @@ m4_include([xattr05.at]) m4_include([acls01.at]) m4_include([acls02.at]) +m4_include([acls03.at]) m4_include([selnx01.at]) m4_include([selacl01.at]) m4_include([capabs_raw01.at]) +AT_BANNER([One top level]) +m4_include([onetop01.at]) +m4_include([onetop02.at]) +m4_include([onetop03.at]) +m4_include([onetop04.at]) + AT_BANNER([Star tests]) m4_include([star/gtarfail.at]) m4_include([star/gtarfail2.at]) diff --git a/tests/time01.at b/tests/time01.at index 3a63dbc..2aa341f 100644 --- a/tests/time01.at +++ b/tests/time01.at @@ -1,6 +1,6 @@ # Test time stamps for GNU tar. -*- Autotest -*- # -# Copyright 2012-2013 Free Software Foundation, Inc. +# Copyright 2012-2014 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/tests/truncate.at b/tests/truncate.at index 3c99c7e..bb572be 100644 --- a/tests/truncate.at +++ b/tests/truncate.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2005, 2007, 2013 Free Software Foundation, Inc. +# Copyright 2005, 2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/ttyemu.c b/tests/ttyemu.c new file mode 100644 index 0000000..27fed9a --- /dev/null +++ b/tests/ttyemu.c @@ -0,0 +1,460 @@ +/* Run program with its first three file descriptors attached to a tty. + + Copyright 2014 Free Software Foundation, Inc. + + This file is part of GNU tar. + + GNU tar is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + GNU tar is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ +#define _XOPEN_SOURCE 600 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef TCSASOFT +# define TCSASOFT 0 +#endif + +#define C_EOT 4 + +#define EX_OK 0 +#define EX_USAGE 125 +#define EX_ERR 126 +#define EX_EXEC 127 + +#define BUF_SIZE 1024 + +#if 0 +# define DEBUG(c) fprintf (stderr, "%s\n", c) +#else +# define DEBUG(c) +#endif + +struct buffer +{ + char buf[BUF_SIZE]; + int avail; + int written; + int cr; + time_t ts; +}; + +#define shut(fildes) \ + do \ + { \ + DEBUG (("closing " #fildes)); \ + close(fildes); \ + fildes = -1; \ + } \ + while(0) + +#define bufinit(buffer,all) \ + do \ + { \ + (buffer).avail = (buffer).written = 0; \ + (buffer).ts = time (NULL); \ + if (all) \ + (buffer).cr = 0; \ + } \ + while(0) + +#define bufisempty(buffer) ((buffer).avail == (buffer).written) +#define bufavail(buffer) (BUF_SIZE - (buffer).avail) + +#define bufread(buffer,fildes,tty) \ + do \ + { \ + int r = read (fildes, (buffer).buf + (buffer).avail, \ + BUF_SIZE - (buffer).avail); \ + (buffer).ts = time (NULL); \ + if (r < 0) \ + { \ + if (errno == EINTR) \ + continue; \ + if (tty && errno == EIO) \ + shut (fildes); \ + else \ + { \ + fprintf (stderr, "%s:%d: reading from %s: %s", \ + __FILE__,__LINE__,#fildes, strerror (errno)); \ + exit (EX_ERR); \ + } \ + } \ + else if (r == 0) \ + shut (fildes); \ + else \ + (buffer).avail += r; \ + } \ + while(0) + +#define bufwrite(buffer,fildes) \ + do \ + { \ + int r = write (fildes, (buffer).buf + (buffer).written, \ + (buffer).avail - (buffer).written); \ + (buffer).ts = time (NULL); \ + if (r < 0) \ + { \ + if (errno == EINTR) \ + continue; \ + if (stop) \ + shut (fildes); \ + else \ + { \ + perror ("writing"); \ + exit (EX_ERR); \ + } \ + } \ + else if (r == 0) \ + /*shut (fildes)*/; \ + else \ + (buffer).written += r; \ + } \ + while(0) + +void +tr (struct buffer *bp) +{ + int i, j; + + for (i = j = bp->written; i < bp->avail;) + { + if (bp->buf[i] == '\r') + { + bp->cr = 1; + i++; + } + else + { + if (bp->cr) + { + bp->cr = 0; + if (bp->buf[i] != '\n') + bp->buf[j++] = '\r'; + } + bp->buf[j++] = bp->buf[i++]; + } + } + bp->avail = j; +} + +int stop; +int status; + +void +sigchld (int sig) +{ + DEBUG (("child exited")); + wait (&status); + stop = 1; +} + +void +noecho (int fd) +{ + struct termios to; + + if (tcgetattr (fd, &to)) + { + perror ("tcgetattr"); + exit (EX_ERR); + } + to.c_lflag |= ICANON; + to.c_lflag &= ~(ECHO | ISIG); + to.c_cc[VEOF] = C_EOT; + if (tcsetattr (fd, TCSAFLUSH | TCSASOFT, &to)) + { + perror ("tcsetattr"); + exit (EX_ERR); + } +} + +char *usage_text[] = { + "usage: ttyemu [-ah] [-i INFILE] [-o OUTFILE] [-t TIMEOUT] PROGRAM [ARGS...]", + "ttyemu runs PROGRAM with its first three file descriptors connected to a" + " terminal", + "", + "Options are:", + "", + " -a append output to OUTFILE, instead of overwriting it", + " -i INFILE read input from INFILE", + " -o OUTFILE write output to OUTFILE", + " -t TIMEOUT set I/O timeout", + " -h print this help summary", + "", + "Report bugs and suggestions to .", + NULL +}; + +static void +usage (void) +{ + int i; + + for (i = 0; usage_text[i]; i++) + { + fputs (usage_text[i], stderr); + fputc ('\n', stderr); + } +} + +int +main (int argc, char **argv) +{ + int i; + int master, slave; + pid_t pid; + fd_set rdset, wrset; + struct buffer ibuf, obuf; + int in = 0, out = 1; + char *infile = NULL, *outfile = NULL; + int outflags = O_TRUNC; + int maxfd; + int eot = C_EOT; + int timeout = 0; + + while ((i = getopt (argc, argv, "ai:o:t:h")) != EOF) + { + switch (i) + { + case 'a': + outflags &= ~O_TRUNC; + break; + + case 'i': + infile = optarg; + break; + + case 'o': + outfile = optarg; + break; + + case 't': + timeout = atoi (optarg); + break; + + case 'h': + usage (); + return EX_OK; + + default: + return EX_USAGE; + } + } + + argc -= optind; + argv += optind; + + if (argc == 0) + { + usage (); + return EX_USAGE; + } + + if (infile) + { + in = open (infile, O_RDONLY); + if (in == -1) + { + perror (infile); + return EX_ERR; + } + } + + if (outfile) + { + out = open (outfile, O_RDWR|O_CREAT|outflags, 0666); + if (out == -1) + { + perror (outfile); + return EX_ERR; + } + } + + master = posix_openpt (O_RDWR); + if (master == -1) + { + perror ("posix_openpty"); + return EX_ERR; + } + + if (grantpt (master)) + { + perror ("grantpt"); + return EX_ERR; + } + + if (unlockpt (master)) + { + perror ("unlockpt"); + return EX_ERR; + } + + signal (SIGCHLD, sigchld); + + pid = fork (); + if (pid == -1) + { + perror ("fork"); + return EX_ERR; + } + + if (pid == 0) + { + slave = open (ptsname (master), O_RDWR); + if (slave < 0) + { + perror ("open"); + return EX_ERR; + } + + noecho (slave); + for (i = 0; i < 3; i++) + { + if (slave != i) + { + close (i); + if (dup (slave) != i) + { + perror ("dup"); + _exit (EX_EXEC); + } + } + } + for (i = sysconf (_SC_OPEN_MAX) - 1; i > 2; --i) + close (i); + + setsid (); +#ifdef TIOCSCTTY + ioctl (0, TIOCSCTTY, 1); +#endif + execvp (argv[0], argv); + perror (argv[0]); + _exit (EX_EXEC); + } + sleep (1); + + bufinit (ibuf, 1); + bufinit (obuf, 1); + while (1) + { + FD_ZERO (&rdset); + FD_ZERO (&wrset); + + maxfd = 0; + + if (in != -1) + { + FD_SET (in, &rdset); + if (in > maxfd) + maxfd = in; + } + + if (master != -1) + { + FD_SET (master, &rdset); + if (!stop) + FD_SET (master, &wrset); + if (master > maxfd) + maxfd = master; + } + + if (maxfd == 0) + { + if (stop) + break; + pause (); + continue; + } + + if (select (maxfd + 1, &rdset, &wrset, NULL, NULL) < 0) + { + if (errno == EINTR) + continue; + perror ("select"); + return EX_ERR; + } + + if (timeout) + { + time_t now = time (NULL); + if (now - ibuf.ts > timeout || now - obuf.ts > timeout) + { + fprintf (stderr, "ttyemu: I/O timeout\n"); + return EX_ERR; + } + } + + if (in >= 0) + { + if (bufavail (ibuf) && FD_ISSET (in, &rdset)) + bufread (ibuf, in, 0); + } + else if (master == -1) + break; + + if (master >= 0 && FD_ISSET (master, &wrset)) + { + if (!bufisempty (ibuf)) + bufwrite (ibuf, master); + else if (in == -1 && eot) + { + DEBUG (("sent EOT")); + if (write (master, &eot, 1) <= 0) + { + perror ("write"); + return EX_ERR; + } + eot = 0; + } + } + + if (master >= 0 && bufavail (obuf) && FD_ISSET (master, &rdset)) + bufread (obuf, master, 1); + + if (bufisempty (obuf)) + bufinit (obuf, 0); + else + { + tr (&obuf); + bufwrite (obuf, out); + } + + if (bufisempty (ibuf)) + bufinit (ibuf, 0); + } + + if (WIFEXITED (status)) + return WEXITSTATUS (status); + + if (WIFSIGNALED (status)) + fprintf (stderr, "ttyemu: child process %s failed on signal %d\n", + argv[0], WTERMSIG (status)); + else + fprintf (stderr, "ttyemu: child process %s failed\n", argv[0]); + return EX_EXEC; +} diff --git a/tests/update.at b/tests/update.at index 8a1194e..bcea558 100644 --- a/tests/update.at +++ b/tests/update.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2005-2007, 2013 Free Software Foundation, Inc. +# Copyright 2005-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/update01.at b/tests/update01.at index 134f69e..813abab 100644 --- a/tests/update01.at +++ b/tests/update01.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2009, 2013 Free Software Foundation, Inc. +# Copyright 2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/update02.at b/tests/update02.at index f6c2d60..4408764 100644 --- a/tests/update02.at +++ b/tests/update02.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2009, 2013 Free Software Foundation, Inc. +# Copyright 2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/verbose.at b/tests/verbose.at index a013e36..4b08be4 100644 --- a/tests/verbose.at +++ b/tests/verbose.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/verify.at b/tests/verify.at index 6d62a80..d63b650 100644 --- a/tests/verify.at +++ b/tests/verify.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/version.at b/tests/version.at index 5fc9c5d..115c116 100644 --- a/tests/version.at +++ b/tests/version.at @@ -1,5 +1,5 @@ # Checking tar version -*- Autotest -*- -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/volsize.at b/tests/volsize.at index 24ac55b..abcd376 100644 --- a/tests/volsize.at +++ b/tests/volsize.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2006-2009, 2013 Free Software Foundation, Inc. +# Copyright 2006-2009, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/volume.at b/tests/volume.at index 33fa3f6..72eab52 100644 --- a/tests/volume.at +++ b/tests/volume.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2004, 2006-2007, 2013 Free Software Foundation, Inc. +# Copyright 2004, 2006-2007, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/xattr01.at b/tests/xattr01.at index e692634..a248b2b 100644 --- a/tests/xattr01.at +++ b/tests/xattr01.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2011, 2013 Free Software Foundation, Inc. +# Copyright 2011, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/xattr02.at b/tests/xattr02.at index 8ae4207..08f5873 100644 --- a/tests/xattr02.at +++ b/tests/xattr02.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2011, 2013 Free Software Foundation, Inc. +# Copyright 2011, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/xattr03.at b/tests/xattr03.at index 19d0172..e8949ce 100644 --- a/tests/xattr03.at +++ b/tests/xattr03.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2012-2013 Free Software Foundation, Inc. +# Copyright 2012-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/xattr04.at b/tests/xattr04.at index fb6ce0e..82d005e 100644 --- a/tests/xattr04.at +++ b/tests/xattr04.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2012-2013 Free Software Foundation, Inc. +# Copyright 2012-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/xattr05.at b/tests/xattr05.at index adc1b58..fa02e89 100644 --- a/tests/xattr05.at +++ b/tests/xattr05.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # # Test suite for GNU tar. -# Copyright 2012-2013 Free Software Foundation, Inc. +# Copyright 2012-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/xform-h.at b/tests/xform-h.at index 6a01169..f0afe6f 100644 --- a/tests/xform-h.at +++ b/tests/xform-h.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2009-2010, 2013 Free Software Foundation, Inc. +# Copyright 2009-2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar. diff --git a/tests/xform01.at b/tests/xform01.at index ff8bff0..0451dee 100644 --- a/tests/xform01.at +++ b/tests/xform01.at @@ -1,7 +1,7 @@ # Process this file with autom4te to create testsuite. -*- Autotest -*- # Test suite for GNU tar. -# Copyright 2010, 2013 Free Software Foundation, Inc. +# Copyright 2010, 2013-2014 Free Software Foundation, Inc. # This file is part of GNU tar.